diff --git a/Source/NETworkManager/Helpers/HistoryListHelper.cs b/Source/NETworkManager/Helpers/ListHelper.cs
similarity index 91%
rename from Source/NETworkManager/Helpers/HistoryListHelper.cs
rename to Source/NETworkManager/Helpers/ListHelper.cs
index 71d16acade..9f0a608aba 100644
--- a/Source/NETworkManager/Helpers/HistoryListHelper.cs
+++ b/Source/NETworkManager/Helpers/ListHelper.cs
@@ -2,7 +2,7 @@
 
 namespace NETworkManager.Helpers
 {
-    public static class HistoryListHelper
+    public static class ListHelper
     {
         public static List<string> Modify(List<string> list, string entry, int length)
         {
diff --git a/Source/NETworkManager/MainWindow.xaml b/Source/NETworkManager/MainWindow.xaml
index 133cc9b52d..f8a999fa92 100644
--- a/Source/NETworkManager/MainWindow.xaml
+++ b/Source/NETworkManager/MainWindow.xaml
@@ -595,9 +595,9 @@
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Rectangle Grid.Column="0" Width="24" Height="24">
+                                <Rectangle Grid.Column="0" Width="20" Height="20">
                                     <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Uniform" Visual="{IconPacks:MaterialLight Kind=ArrowLeftCircle}" />
+                                        <VisualBrush Stretch="Uniform" Visual="{IconPacks:MaterialLight Kind=ArrowLeft}" />
                                     </Rectangle.OpacityMask>
                                     <Rectangle.Style>
                                         <Style TargetType="{x:Type Rectangle}">
diff --git a/Source/NETworkManager/Models/Network/DNSLookup.cs b/Source/NETworkManager/Models/Network/DNSLookup.cs
index 7e6005dc2e..66f0883328 100644
--- a/Source/NETworkManager/Models/Network/DNSLookup.cs
+++ b/Source/NETworkManager/Models/Network/DNSLookup.cs
@@ -1,6 +1,9 @@
 using Heijden.DNS;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
+using System.Net.NetworkInformation;
 using System.Threading.Tasks;
 
 namespace NETworkManager.Models.Network
@@ -8,7 +11,7 @@ namespace NETworkManager.Models.Network
     public class DNSLookup
     {
         #region Variables
-        Resolver DNSResolver = new Resolver();
+        Resolver dnsResolver = new Resolver();
         #endregion
 
         #region Events
@@ -26,103 +29,145 @@ protected virtual void OnLookupError(DNSLookupErrorArgs e)
             LookupError?.Invoke(this, e);
         }
 
-        public event EventHandler<DNSLookupCompleteArgs> LookupComplete;
+        public event EventHandler LookupComplete;
 
-        protected virtual void OnLookupComplete(DNSLookupCompleteArgs e)
+        protected virtual void OnLookupComplete()
         {
-            LookupComplete?.Invoke(this, e);
+            LookupComplete?.Invoke(this, EventArgs.Empty);
         }
         #endregion
 
         #region Methods        
-        public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions DNSLookupOptions)
+        public void LookupAsync(List<string> hosts, DNSLookupOptions dnsLookupOptions)
         {
             Task.Run(() =>
             {
-                // This will convert the query to an Arpa request
-                if (DNSLookupOptions.Type == QType.PTR)
+                // DNS server list
+                List<string> dnsServers = new List<string>();
+
+                if (dnsLookupOptions.UseCustomDNSServer)
+                    dnsLookupOptions.CustomDNSServers.ForEach(x => dnsServers.Add(x));
+                else // Use windows default dns server, but filter/remove IPv6 site local addresses (fec0:0:0:0:ffff::)
+                    dnsResolver.DnsServers.Where(x => !x.Address.ToString().StartsWith(@"fec0")).Select(y => y.Address.ToString()).ToList().ForEach(x => dnsServers.Add(x));
+
+                // Foreach host
+                foreach (string host in hosts)
                 {
-                    if (IPAddress.TryParse(hostnameOrIPAddress, out IPAddress ip))
-                        hostnameOrIPAddress = Resolver.GetArpaFromIp(ip);
-                }
+                    // Default
+                    string name = host;
 
-                if (DNSLookupOptions.Type == QType.NAPTR)
-                    hostnameOrIPAddress = Resolver.GetArpaFromEnum(hostnameOrIPAddress);
+                    string dnsSuffix = string.Empty;
 
-                if (DNSLookupOptions.UseCustomDNSServer)
-                    DNSResolver.DnsServer = DNSLookupOptions.CustomDNSServer;
+                    if (name.IndexOf(".", StringComparison.OrdinalIgnoreCase) == -1)
+                    {
+                        if (dnsLookupOptions.AddDNSSuffix)
+                        {
+                            if (dnsLookupOptions.UseCustomDNSSuffix)
+                                dnsSuffix = dnsLookupOptions.CustomDNSSuffix;
+                            else
+                                dnsSuffix = IPGlobalProperties.GetIPGlobalProperties().DomainName;
+                        }
+                    }
 
-                DNSResolver.Recursion = DNSLookupOptions.Recursion;
-                DNSResolver.TransportType = DNSLookupOptions.TransportType;
-                DNSResolver.Retries = DNSLookupOptions.Attempts;
-                DNSResolver.TimeOut = DNSLookupOptions.Timeout;
+                    // Append dns suffix to hostname
+                    if (!string.IsNullOrEmpty(dnsSuffix))
+                        name += string.Format(".{0}", dnsSuffix);
 
-                Response dnsResponse = DNSResolver.Query(hostnameOrIPAddress, DNSLookupOptions.Type, DNSLookupOptions.Class);
+                    // PTR
+                    if (dnsLookupOptions.Type == QType.PTR)
+                    {
+                        if (IPAddress.TryParse(name, out IPAddress ip))
+                            name = Resolver.GetArpaFromIp(ip);
+                    }
 
-                // If there was an error... return
-                if (!string.IsNullOrEmpty(dnsResponse.Error))
-                {
-                    OnLookupError(new DNSLookupErrorArgs(dnsResponse.Error, DNSResolver.DnsServer));
-                    return;
-                }
+                    // NAPTR
+                    if (dnsLookupOptions.Type == QType.NAPTR)
+                        name = Resolver.GetArpaFromEnum(name);
 
-                // Process the results...
-                ProcessResponse(dnsResponse);
+                    int port = dnsLookupOptions.UseCustomDNSServer ? dnsLookupOptions.Port : Resolver.DefaultPort;
 
-                // If we get a CNAME back (from a result), do a second request and try to get the A, AAAA etc... 
-                if (DNSLookupOptions.ResolveCNAME && DNSLookupOptions.Type != QType.CNAME)
-                {
-                    foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
+                    Parallel.ForEach(dnsServers, dnsServer =>
                     {
-                        Response DNSResponse2 = DNSResolver.Query(r.CNAME, DNSLookupOptions.Type, DNSLookupOptions.Class);
+                        // Create a new for each request
+                        Resolver resolver = new Resolver(dnsServer, port)
+                        {
+                            Recursion = dnsLookupOptions.Recursion,
+                            TransportType = dnsLookupOptions.TransportType,
+                            Retries = dnsLookupOptions.Attempts,
+                            TimeOut = dnsLookupOptions.Timeout
+                        };
 
-                        if (!string.IsNullOrEmpty(DNSResponse2.Error))
+                        Response dnsResponse = resolver.Query(name, dnsLookupOptions.Type, dnsLookupOptions.Class);
+
+                        // If there was an error... return
+                        if (!string.IsNullOrEmpty(dnsResponse.Error))
                         {
-                            OnLookupError(new DNSLookupErrorArgs(DNSResponse2.Error, DNSResolver.DnsServer));
-                            continue;
+                            OnLookupError(new DNSLookupErrorArgs(dnsResponse.Error, resolver.DnsServer));
+                            return;
                         }
 
-                        ProcessResponse(DNSResponse2);
-                    }
+                        // Process the results...
+                        ProcessResponse(dnsResponse);
+
+                        // If we get a CNAME back (from an ANY result), do a second request and try to get the A, AAAA etc... 
+                        if (dnsLookupOptions.ResolveCNAME && dnsLookupOptions.Type == QType.ANY)
+                        {
+                            foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
+                            {
+                                Response dnsResponse2 = resolver.Query(r.CNAME, dnsLookupOptions.Type, dnsLookupOptions.Class);
+
+                                if (!string.IsNullOrEmpty(dnsResponse2.Error))
+                                {
+                                    OnLookupError(new DNSLookupErrorArgs(dnsResponse2.Error, resolver.DnsServer));
+                                    continue;
+                                }
+
+                                ProcessResponse(dnsResponse2);
+                            }
+                        }
+                    });
                 }
-                
-                OnLookupComplete(new DNSLookupCompleteArgs(dnsResponse.Server.ToString(), dnsResponse.Questions.Count, dnsResponse.Answers.Count, dnsResponse.Authorities.Count, dnsResponse.Additionals.Count, dnsResponse.MessageSize));
+
+                OnLookupComplete();
             });
         }
 
         private void ProcessResponse(Response dnsResponse)
         {
+            string dnsServer = dnsResponse.Server.Address.ToString();
+            int port = dnsResponse.Server.Port;
+
             // A
             foreach (RecordA r in dnsResponse.RecordsA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // AAAA
             foreach (RecordAAAA r in dnsResponse.RecordsAAAA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // CNAME
             foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // MX
             foreach (RecordMX r in dnsResponse.RecordsMX)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // NS
             foreach (RecordNS r in dnsResponse.RecordsNS)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // PTR
             foreach (RecordPTR r in dnsResponse.RecordsPTR)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // SOA
             foreach (RecordSOA r in dnsResponse.RecordsSOA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
 
             // TXT
             foreach (RecordTXT r in dnsResponse.RecordsTXT)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r, dnsServer, port));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/Models/Network/DNSLookupOptions.cs b/Source/NETworkManager/Models/Network/DNSLookupOptions.cs
index 6fa2f2d879..9a6e48f499 100644
--- a/Source/NETworkManager/Models/Network/DNSLookupOptions.cs
+++ b/Source/NETworkManager/Models/Network/DNSLookupOptions.cs
@@ -1,11 +1,16 @@
 using Heijden.DNS;
+using System.Collections.Generic;
 
 namespace NETworkManager.Models.Network
 {
     public class DNSLookupOptions
     {
         public bool UseCustomDNSServer { get; set; }
-        public string CustomDNSServer { get; set; }
+        public List<string> CustomDNSServers { get; set; }
+        public int Port { get; set; }
+        public bool AddDNSSuffix { get; set; }
+        public bool UseCustomDNSSuffix { get; set; }
+        public string CustomDNSSuffix { get; set; }
         public QClass Class { get; set; }
         public QType Type { get; set; }
         public bool Recursion { get; set; }
diff --git a/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs
index 5e47b1a3c4..ef94667382 100644
--- a/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs
+++ b/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs
@@ -6,16 +6,20 @@ public class DNSLookupRecordArgs : System.EventArgs
     {        
         public RR ResourceRecord { get; set; }
         public string Result { get; set; }
+        public string DNSServer { get; set; }
+        public int Port { get; set; }
 
         public DNSLookupRecordArgs()
         {
 
         }
 
-        public DNSLookupRecordArgs(RR resourceRecord, object result)
+        public DNSLookupRecordArgs(RR resourceRecord, object result, string dnsServer, int port)
         {
             ResourceRecord = resourceRecord;
             Result = result.ToString().TrimEnd();
+            DNSServer = dnsServer;
+            Port = port;
         }
     }
 }
diff --git a/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs b/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs
index 432d23bb5f..c29f3f6ed9 100644
--- a/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs
+++ b/Source/NETworkManager/Models/Network/DNSLookupRecordInfo.cs
@@ -9,24 +9,28 @@ public class DNSLookupRecordInfo
         public string Class { get; set; }
         public string Type { get; set; }
         public string Result { get; set; }
+        public string DNSServer { get; set; }
+        public int Port { get; set; }
 
         public DNSLookupRecordInfo()
         {
 
         }
 
-        public DNSLookupRecordInfo(RR resourceRecord, string result)
+        public DNSLookupRecordInfo(RR resourceRecord, string result, string dnsServer, int port)
         {
             Name = resourceRecord.NAME;
             TTL = resourceRecord.TTL;
             Class = resourceRecord.Class.ToString();
             Type = resourceRecord.Type.ToString();
             Result = result;
+            DNSServer = dnsServer;
+            Port = port;
         }
 
         public static DNSLookupRecordInfo Parse(DNSLookupRecordArgs e)
         {
-            return new DNSLookupRecordInfo(e.ResourceRecord, e.Result);
+            return new DNSLookupRecordInfo(e.ResourceRecord, e.Result, e.DNSServer, e.Port);
         }
     }
 }
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index 0a7d55832a..a5ad9c623e 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -903,8 +903,8 @@ public bool DNSLookup_UseCustomDNSServer
             }
         }
 
-        private string _dnsLookup_CustomDNSServer;
-        public string DNSLookup_CustomDNSServer
+        private List<string> _dnsLookup_CustomDNSServer;
+        public List<string> DNSLookup_CustomDNSServer
         {
             get { return _dnsLookup_CustomDNSServer; }
             set
@@ -917,6 +917,20 @@ public string DNSLookup_CustomDNSServer
             }
         }
 
+        private int _dnsLookup_Port = 53;
+        public int DNSLookup_Port
+        {
+            get { return _dnsLookup_Port; }
+            set
+            {
+                if (value == _dnsLookup_Port)
+                    return;
+
+                _dnsLookup_Port = value;
+                SettingsChanged = true;
+            }
+        }
+
         private QClass _dnsLookup_Class = QClass.IN;
         public QClass DNSLookup_Class
         {
@@ -973,7 +987,7 @@ public bool DNSLookup_UseCustomDNSSuffix
             }
         }
 
-        private string _dnsLookup_CustomDNSSuffix;
+        private string _dnsLookup_CustomDNSSuffix = string.Empty;
         public string DNSLookup_CustomDNSSuffix
         {
             get { return _dnsLookup_CustomDNSSuffix; }
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
index c12b8316e4..354a4fec82 100644
--- a/Source/NETworkManager/NETworkManager.csproj
+++ b/Source/NETworkManager/NETworkManager.csproj
@@ -214,6 +214,7 @@
     <Compile Include="Models\Update\UpdateAvailableArgs.cs" />
     <Compile Include="Models\Update\Updater.cs" />
     <Compile Include="Validators\Int32Validator.cs" />
+    <Compile Include="Validators\MultipleIPAddressesValidator.cs" />
     <Compile Include="Validators\MultipleHostsValidator.cs" />
     <Compile Include="Validators\HttpAndHttpsUriValidator.cs" />
     <Compile Include="Validators\SubnetCalculatorSubnetValidator.cs" />
@@ -676,7 +677,7 @@
     <Compile Include="Converters\ValidateSettingsImportConverter.cs" />
     <Compile Include="Converters\ValidateSettingsResetConverter.cs" />
     <Compile Include="Converters\ValidateSettingsExportConverter.cs" />
-    <Compile Include="Helpers\HistoryListHelper.cs" />
+    <Compile Include="Helpers\ListHelper.cs" />
     <Compile Include="Helpers\HotKeysHelper.cs" />
     <Compile Include="Models\Network\ARPTable.cs" />
     <Compile Include="Helpers\PortRangeHelper.cs" />
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
index 27e91aec42..93584d1a5f 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -150,7 +150,7 @@
     <system:String x:Key="String_Yes">Ja</system:String>
     <system:String x:Key="String_No">Nein</system:String>
     <system:String x:Key="String_DNSSuffix">DNS-Suffix</system:String>
-    <system:String x:Key="String_DNSServers">DNS-Servers</system:String>
+    <system:String x:Key="String_DNSServers">DNS-Server(s)</system:String>
     <system:String x:Key="String_DynamicIPv4Address">Dynamische IPv4-Adresse</system:String>
     <system:String x:Key="String_StaticIPv4Address">Statische IPv4-Address</system:String>
     <system:String x:Key="String_StaticIPv4DNSServer">Statischer IPv4-DNS-Server</system:String>
@@ -214,7 +214,7 @@
     <system:String x:Key="String_Service">Dienst</system:String>
     <system:String x:Key="String_ShowClosedPorts">Geschlossene Ports anzeigen</system:String>
     <system:String x:Key="String_HostnameOrIPAddress">Hostname oder IP-Adresse</system:String>
-    <system:String x:Key="String_Ports">Ports</system:String>
+    <system:String x:Key="String_Ports">Port(s)</system:String>
     <system:String x:Key="String_NumberOfStoredEntries">Anzahl gespeicherter Einträge</system:String>
     <system:String x:Key="String_NetworkLocationCannotBeReached">Die Netzwerkadresse kann nicht erreicht werden. Überprüfen Sie, ob Ihr Computer mit dem Netzwerk verbunden ist. Informationen zur Netzwerk-Fehlersuche finden Sie in der Windows-Hilfe.</system:String>
     <system:String x:Key="String_NumberOfErrorsAfterWhichIsCanceled">Anzahl Fehler nach denen abgebrochen wird:</system:String>
@@ -236,7 +236,7 @@
     <system:String x:Key="String_NoDNSRecordFoundCheckYourInputAndSettings">Kein DNS-Eintrag für "{0}" gefunden! Überprüfe deine Eingabe und die Einstellungen.</system:String>
     <system:String x:Key="String_UnkownError">Unbekannter Fehler!</system:String>
     <system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout beim Abfragen des DNS-Servers mit der IP-Adresse "{0}"!</system:String>
-    <system:String x:Key="String_ResolveCNAME">CNAME auflösen</system:String>
+    <system:String x:Key="String_ResolveCNAME">CNAME auflösen bei ANY anfragen</system:String>
     <system:String x:Key="String_Host">Host</system:String>
     <system:String x:Key="String_CouldNotResolveHostnameFor">Hostname konnte nicht aufgelöst werden für: "{0}"</system:String>
     <system:String x:Key="String_NothingToDoCheckYourInput">Nichts zu tun. Überprüfen Sie Ihre Eingabe!</system:String>
@@ -246,7 +246,6 @@
     <system:String x:Key="String_TheFollwingParametersCanNotBeProcesses">Die folgenden Parameter können nicht verarbeitet werden:</system:String>
     <system:String x:Key="String_TheFollowingParametersAreAvailable">Folgende Parameter stehen zur Verfügung:</system:String>
     <system:String x:Key="String_Open">Offen</system:String>
-    <system:String x:Key="String_CustomDNSServerIsEmptyCheckYourSettingsUseWindowsOwnDNSServer">Benutzerdefinierte DNS-Server ist leer. Überprüfe deine Einstellungen! (Verwende Windows eigenen DNS-Server...)</system:String>
     <system:String x:Key="String_EnterNameForProfile">Geben Sie einen Namen ein, unter dem das Profil gespeichert werden soll.</system:String>
     <system:String x:Key="String_DeleteProfileMessage">Das ausgewählte Profil wird unwiderruflich gelöscht.</system:String>
     <system:String x:Key="String_DeleteSessionMessage">Die ausgewählte Sitzung wird unwiderruflich gelöscht.</system:String>
@@ -437,6 +436,7 @@
     <system:String x:Key="String_Watermark_ExampleHostname">SERVER-01</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Broadcast">192.168.178.255</system:String>
     <system:String x:Key="String_Watermark_ExamplePort7">7</system:String>
+    <system:String x:Key="String_Watermark_ExamplePort53">53</system:String>
     <system:String x:Key="String_Watermark_ExamplePort161">161</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
@@ -449,6 +449,7 @@
     <system:String x:Key="String_Watermark_ExampleSubnetmaskOrCIDR">/24 oder 255.255.255.0</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Gateway">192.168.178.1</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4DNSServer">8.8.8.8</system:String>
+    <system:String x:Key="String_Watermark_ExampleIPv4DNSServers">192.168.178.1; 8.8.8.8; 8.8.4.4</system:String>
     <system:String x:Key="String_Watermark_ExamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 oder 192.168.178.133/255.255.252.0</system:String>
     <system:String x:Key="String_Watermark_Filter">Filter...</system:String>
@@ -496,7 +497,8 @@
     <system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Geben Sie eine gültige Webseite ein (z.B. https://example.com/index.html)</system:String>
     <system:String x:Key="String_ValidateError_EnterValidHosts">Geben Sie gültige Hosts ein (mehrere Hosts dürfen nicht mit ";" enden)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidNumber">Geben Sie eine gültige Zahl ein!</system:String>
-    
+    <system:String x:Key="String_ValidateError_EnterOneOrMoreValidIPAddresses">Geben Sie eine oder mehrere gültige IP-Adressen ein!</system:String>
+
     <!-- ApplicationInfo.Name -->
     <system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>
     <system:String x:Key="String_ApplicationName_NetworkInterface">Netzwerkinterface</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
index 4e6c38cc9f..058871b854 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -150,7 +150,7 @@
     <system:String x:Key="String_Yes">Yes</system:String>
     <system:String x:Key="String_No">No</system:String>
     <system:String x:Key="String_DNSSuffix">DNS Suffix</system:String>
-    <system:String x:Key="String_DNSServers">DNS Servers</system:String>
+    <system:String x:Key="String_DNSServers">DNS Server(s)</system:String>
     <system:String x:Key="String_DynamicIPv4Address">Dynamic IPv4 Address</system:String>
     <system:String x:Key="String_StaticIPv4Address">Static IPv4 Address</system:String>
     <system:String x:Key="String_StaticIPv4DNSServer">Static IPv4 DNS Server</system:String>
@@ -214,7 +214,7 @@
     <system:String x:Key="String_Service">Service</system:String>
     <system:String x:Key="String_ShowClosedPorts">Show closed ports</system:String>
     <system:String x:Key="String_HostnameOrIPAddress">Hostname or IP address</system:String>
-    <system:String x:Key="String_Ports">Ports</system:String>
+    <system:String x:Key="String_Ports">Port(s)</system:String>
     <system:String x:Key="String_NumberOfStoredEntries">Number of stored entries</system:String>
     <system:String x:Key="String_NetworkLocationCannotBeReached">The network address cannot be reached. Check if your computer is connected to the network. For information about network troubleshooting, see Windows Help.</system:String>
     <system:String x:Key="String_NumberOfErrorsAfterWhichIsCanceled">Number of errors after which is canceled:</system:String>
@@ -236,7 +236,7 @@
     <system:String x:Key="String_NoDNSRecordFoundCheckYourInputAndSettings">No DNS record found for "{0}"! Check your input and the settings.</system:String>
     <system:String x:Key="String_UnkownError">Unkown error!</system:String>
     <system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout when querying the DNS server with the IP address "{0}"!</system:String>
-    <system:String x:Key="String_ResolveCNAME">Resolve CNAME</system:String>
+    <system:String x:Key="String_ResolveCNAME">Resolve CNAME on ANY requests</system:String>
     <system:String x:Key="String_Host">Host</system:String>
     <system:String x:Key="String_CouldNotResolveHostnameFor">Could not resolve hostname for: "{0}"</system:String>
     <system:String x:Key="String_NothingToDoCheckYourInput">Nothing to do. Check your input!</system:String>
@@ -246,7 +246,6 @@
     <system:String x:Key="String_TheFollwingParametersCanNotBeProcesses">The following parameters can not be processed:</system:String>
     <system:String x:Key="String_TheFollowingParametersAreAvailable">The following parameters are available:</system:String>
     <system:String x:Key="String_Open">Open</system:String>
-    <system:String x:Key="String_CustomDNSServerIsEmptyCheckYourSettingsUseWindowsOwnDNSServer">Custom DNS server is empty. Check your settings! (Use windows own DNS server...)</system:String>
     <system:String x:Key="String_EnterNameForProfile">Enter a name under which you want to save the profile.</system:String>
     <system:String x:Key="String_DeleteProfileMessage">The selected profile will be deleted permanently.</system:String>
     <system:String x:Key="String_DeleteSessionMessage">The selected session will be deleted permanently.</system:String>
@@ -437,6 +436,7 @@
     <system:String x:Key="String_Watermark_ExampleHostname">SERVER-01</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Broadcast">192.168.178.255</system:String>
     <system:String x:Key="String_Watermark_ExamplePort7">7</system:String>
+    <system:String x:Key="String_Watermark_ExamplePort53">53</system:String>
     <system:String x:Key="String_Watermark_ExamplePort161">161</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
@@ -449,6 +449,7 @@
     <system:String x:Key="String_Watermark_ExampleSubnetmaskOrCIDR">/24 or 255.255.255.0</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4Gateway">192.168.178.1</system:String>
     <system:String x:Key="String_Watermark_ExampleIPv4DNSServer">8.8.8.8</system:String>
+    <system:String x:Key="String_Watermark_ExampleIPv4DNSServers">192.168.178.1; 8.8.8.8; 8.8.4.4</system:String>
     <system:String x:Key="String_Watermark_ExamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 or 192.168.178.133/255.255.252.0</system:String>
     <system:String x:Key="String_Watermark_Filter">Filter...</system:String>
@@ -468,7 +469,7 @@
     <system:String x:Key="String_Watermark_NotChanged">(not changed)</system:String>
     <system:String x:Key="String_Watermark_ExampleSNMPOID">1.3.6.1.2.1.1</system:String>
     <system:String x:Key="String_Watermark_ExampleSNMPCommunity">Public</system:String>
-    <system:String x:Key="String_Watermark_ExampleSNMPUsername">snmp-user</system:String>
+    <system:String x:Key="String_Watermark_ExampleSNMPUsername">snmp-user</system:String>    
     
     <!-- ShowProgress -->
     <system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP address and gateway...</system:String>
@@ -496,6 +497,7 @@
     <system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Enter a valid website (like https://example.com/index.html)</system:String>
     <system:String x:Key="String_ValidateError_EnterValidHosts">Enter valid hosts (multiple hosts can not end with ";")!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidNumber">Enter a valid number!</system:String>
+    <system:String x:Key="String_ValidateError_EnterOneOrMoreValidIPAddresses">Enter one or more valid IP addresses!</system:String>
     
     <!-- ApplicationView.Name -->
     <system:String x:Key="String_ApplicationName_IPScanner">IP Scanner</system:String>
diff --git a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
index 32d5932094..8208617298 100644
--- a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
@@ -12,16 +12,16 @@
                             BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid Background="Transparent" SnapsToDevicePixels="False">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
+                            <Rectangle Grid.Column="0" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronDown}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
-                            <Controls:ContentControlEx Grid.Column="0" 
-                                                       Margin="0" 
+                            <Controls:ContentControlEx Grid.Column="1" 
+                                                       Margin="10,0,0,0" 
                                                        HorizontalAlignment="Stretch"
                                                        Padding="{TemplateBinding Padding}" 
                                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -55,12 +55,73 @@
 
     <Style x:Key="DefaultExpander" TargetType="{x:Type Expander}" BasedOn="{StaticResource MetroExpander}">
         <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource GrayBrush3}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{DynamicResource ExpanderDownHeader}" />
     </Style>
 
+    <Style x:Key="ExpanderDownHeaderReverse" BasedOn="{StaticResource ExpanderDownHeaderStyle}" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Controls:ContentControlEx Grid.Column="0" 
+                                                       Margin="0,0,10,0" 
+                                                       HorizontalAlignment="Stretch"
+                                                       Padding="{TemplateBinding Padding}" 
+                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                       Content="{TemplateBinding Content}"
+                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
+                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                       RecognizesAccessKey="True"
+                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                            </Controls:ContentControlEx>
+                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronDown}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>                           
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Chevron" Property="OpacityMask">
+                                <Setter.Value>
+                                    <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronUp}" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource GrayBrush5}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="HeaderExpander" TargetType="{x:Type Expander}" BasedOn="{StaticResource MetroExpander}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Margin" Value="-4" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource GrayBrush3}" />
+        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
+        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{DynamicResource ExpanderDownHeaderReverse}" />
+    </Style>
+
     <Style x:Key="RightExpanderOpen" BasedOn="{StaticResource ExpanderDownHeaderStyle}" TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -75,7 +136,7 @@
                                 <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">
+                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" Margin="0,10,10,0" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronLeft}" />
                                 </Rectangle.OpacityMask>
@@ -105,7 +166,7 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            <Rectangle Grid.Row="0" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}" Margin="10,16.5,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <Rectangle Grid.Row="0" x:Name="Chevron" Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" Margin="10,14.5,10,10" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=ChevronRight}" />
                                 </Rectangle.OpacityMask>
@@ -126,7 +187,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/Validators/MultipleIPAddressesValidator.cs b/Source/NETworkManager/Validators/MultipleIPAddressesValidator.cs
new file mode 100644
index 0000000000..a9cf08b1b6
--- /dev/null
+++ b/Source/NETworkManager/Validators/MultipleIPAddressesValidator.cs
@@ -0,0 +1,21 @@
+using NETworkManager.Helpers;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NETworkManager.Validators
+{
+    public class MultipleIPAddressesValidator : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {
+            foreach (string ipAddress in (value as string).Split(';'))
+            {
+                if (!Regex.IsMatch(ipAddress.Trim(), RegexHelper.IPv4AddressRegex) && !Regex.IsMatch(ipAddress.Trim(), RegexHelper.IPv6AddressRegex))
+                    return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterOneOrMoreValidIPAddresses"] as string);
+            }
+            return ValidationResult.ValidResult;
+        }
+    }
+}
diff --git a/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs
index 37a31c2f22..ac3fb3273b 100644
--- a/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs
@@ -6,7 +6,6 @@
 using System.Windows;
 using System.Windows.Input;
 using NETworkManager.Collections;
-using System.Net.NetworkInformation;
 using System.Windows.Threading;
 using System.Diagnostics;
 using Heijden.DNS;
@@ -180,90 +179,6 @@ public DateTime? EndTime
             }
         }
 
-        private string _dnsServerAndPort;
-        public string DNSServerAndPort
-        {
-            get { return _dnsServerAndPort; }
-            set
-            {
-                if (value == _dnsServerAndPort)
-                    return;
-
-                _dnsServerAndPort = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private int _questions;
-        public int Questions
-        {
-            get { return _questions; }
-            set
-            {
-                if (value == _questions)
-                    return;
-
-                _questions = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private int _answers;
-        public int Answers
-        {
-            get { return _answers; }
-            set
-            {
-                if (value == _answers)
-                    return;
-
-                _answers = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private int _authorities;
-        public int Authorities
-        {
-            get { return _authorities; }
-            set
-            {
-                if (value == _authorities)
-                    return;
-
-                _authorities = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private int _additionals;
-        public int Additionals
-        {
-            get { return _additionals; }
-            set
-            {
-                if (value == _additionals)
-                    return;
-
-                _additionals = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private int _messageSize;
-        public int MessageSize
-        {
-            get { return _messageSize; }
-            set
-            {
-                if (value == _messageSize)
-                    return;
-
-                _messageSize = value;
-                OnPropertyChanged();
-            }
-        }
-
         private bool _expandStatistics;
         public bool ExpandStatistics
         {
@@ -287,6 +202,7 @@ public DNSLookupViewModel()
         {
             _hostHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.DNSLookup_HostHistory);
             _lookupResultView = CollectionViewSource.GetDefaultView(LookupResult);
+            _lookupResultView.GroupDescriptions.Add(new PropertyGroupDescription("DNSServer"));
 
             LoadSettings();
 
@@ -369,15 +285,9 @@ private void CopySelectedResultAction()
         private void StartLookup()
         {
             DisplayStatusMessage = false;
-            IsLookupRunning = true;
+            StatusMessage = string.Empty;
 
-            // Reset statistic
-            DNSServerAndPort = string.Empty;
-            Questions = 0;
-            Answers = 0;
-            Authorities = 0;
-            Additionals = 0;
-            MessageSize = 0;
+            IsLookupRunning = true;
 
             // Measure the time
             StartTime = DateTime.Now;
@@ -392,57 +302,39 @@ private void StartLookup()
 
             AddHostToHistory(Host);
 
-            DNSLookupOptions DNSLookupOptions = new DNSLookupOptions();
+            DNSLookupOptions dnsLookupOptions = new DNSLookupOptions();
 
             if (SettingsManager.Current.DNSLookup_UseCustomDNSServer)
             {
-                if (!string.IsNullOrEmpty(SettingsManager.Current.DNSLookup_CustomDNSServer))
-                {
-                    DNSLookupOptions.UseCustomDNSServer = SettingsManager.Current.DNSLookup_UseCustomDNSServer;
-                    DNSLookupOptions.CustomDNSServer = SettingsManager.Current.DNSLookup_CustomDNSServer;
-                }
-                else
-                {
-                    StatusMessage = Application.Current.Resources["String_CustomDNSServerIsEmptyCheckYourSettingsUseWindowsOwnDNSServer"] as string;
-                    DisplayStatusMessage = true;
-                }
+                dnsLookupOptions.UseCustomDNSServer = SettingsManager.Current.DNSLookup_UseCustomDNSServer;
+                dnsLookupOptions.CustomDNSServers = SettingsManager.Current.DNSLookup_CustomDNSServer.Select(x => x.Trim()).ToList();
+                dnsLookupOptions.Port = SettingsManager.Current.DNSLookup_Port;
             }
 
-            DNSLookupOptions.Class = SettingsManager.Current.DNSLookup_Class;
-            DNSLookupOptions.Type = Type;
-            DNSLookupOptions.Recursion = SettingsManager.Current.DNSLookup_Recursion;
-            DNSLookupOptions.UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache;
-            DNSLookupOptions.TransportType = SettingsManager.Current.DNSLookup_TransportType;
-            DNSLookupOptions.Attempts = SettingsManager.Current.DNSLookup_Attempts;
-            DNSLookupOptions.Timeout = SettingsManager.Current.DNSLookup_Timeout;
-            DNSLookupOptions.ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME;
+            dnsLookupOptions.AddDNSSuffix = SettingsManager.Current.DNSLookup_AddDNSSuffix;
+
+            if (SettingsManager.Current.DNSLookup_UseCustomDNSSuffix)
+            {
+                dnsLookupOptions.UseCustomDNSSuffix = true;
+                dnsLookupOptions.CustomDNSSuffix = SettingsManager.Current.DNSLookup_CustomDNSSuffix.TrimStart('.');
+            }
+
+            dnsLookupOptions.Class = SettingsManager.Current.DNSLookup_Class;
+            dnsLookupOptions.Type = Type;
+            dnsLookupOptions.Recursion = SettingsManager.Current.DNSLookup_Recursion;
+            dnsLookupOptions.UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache;
+            dnsLookupOptions.TransportType = SettingsManager.Current.DNSLookup_TransportType;
+            dnsLookupOptions.Attempts = SettingsManager.Current.DNSLookup_Attempts;
+            dnsLookupOptions.Timeout = SettingsManager.Current.DNSLookup_Timeout;
+            dnsLookupOptions.ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME;
 
             DNSLookup DNSLookup = new DNSLookup();
 
             DNSLookup.RecordReceived += DNSLookup_RecordReceived;
             DNSLookup.LookupError += DNSLookup_LookupError;
-            DNSLookup.LookupComplete += DNSLookup_LookupComplete;
-
-            string hostnameOrIPAddress = Host;
-            string dnsSuffix = string.Empty;
+            DNSLookup.LookupComplete += DNSLookup_LookupComplete; ;
 
-            // Detect hostname (usually they don't contain ".")
-            if (Host.IndexOf(".", StringComparison.OrdinalIgnoreCase) == -1)
-            {
-                if (SettingsManager.Current.DNSLookup_AddDNSSuffix)
-                {
-                    if (SettingsManager.Current.DNSLookup_UseCustomDNSSuffix)
-                        dnsSuffix = SettingsManager.Current.DNSLookup_CustomDNSSuffix;
-                    else
-                        dnsSuffix = IPGlobalProperties.GetIPGlobalProperties().DomainName;
-                }
-            }
-
-            // Append dns suffix to hostname
-            if (!string.IsNullOrEmpty(dnsSuffix))
-                hostnameOrIPAddress += string.Format("{0}{1}", dnsSuffix.StartsWith(".") ? "" : ".", dnsSuffix);
-
-            DNSLookup.LookupAsync(hostnameOrIPAddress, DNSLookupOptions);
+            DNSLookup.LookupAsync(Host.Split(';').Select(x => x.Trim()).ToList(), dnsLookupOptions);
         }
 
         private void LookupFinished()
@@ -463,7 +355,7 @@ private void LookupFinished()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.DNSLookup_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.DNSLookup_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.DNSLookup_HostHistory.Clear();
@@ -479,39 +371,29 @@ private void DNSLookup_RecordReceived(object sender, DNSLookupRecordArgs e)
         {
             DNSLookupRecordInfo DNSLookupRecordInfo = DNSLookupRecordInfo.Parse(e);
 
-            Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(delegate ()
-             {
-                 LookupResult.Add(DNSLookupRecordInfo);
-             }));
+            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Send, new Action(delegate ()
+            {
+                LookupResult.Add(DNSLookupRecordInfo);
+            }));
         }
 
         private void DNSLookup_LookupError(object sender, DNSLookupErrorArgs e)
         {
+            if (!string.IsNullOrEmpty(StatusMessage))
+                StatusMessage += Environment.NewLine;
+
             if (e.ErrorCode == "Timeout Error")
-                StatusMessage = string.Format(Application.Current.Resources["String_TimeoutWhenQueryingDNSServer"] as string, e.DNSServer);
+                StatusMessage += string.Format(Application.Current.Resources["String_TimeoutWhenQueryingDNSServer"] as string, e.DNSServer);
             else
-                StatusMessage = Application.Current.Resources["String_UnkownError"] as string;
+                StatusMessage += Application.Current.Resources["String_UnkownError"] as string;
 
             DisplayStatusMessage = true;
 
             LookupFinished();
         }
 
-        private void DNSLookup_LookupComplete(object sender, DNSLookupCompleteArgs e)
+        private void DNSLookup_LookupComplete(object sender, EventArgs e)
         {
-            DNSServerAndPort = e.ServerAndPort;
-            Questions = e.QuestionsCount;
-            Answers = e.AnswersCount;
-            Authorities = e.AuthoritiesCount;
-            Additionals = e.AdditionalsCount;
-            MessageSize = e.MessageSize;
-
-            if (e.AnswersCount == 0)
-            {
-                StatusMessage = string.Format(Application.Current.Resources["String_NoDNSRecordFoundCheckYourInputAndSettings"] as string, Host);
-                DisplayStatusMessage = true;
-            }
-
             LookupFinished();
         }
 
diff --git a/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs
index 2adb7ecc04..9f24c90b18 100644
--- a/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs
@@ -253,7 +253,7 @@ private async void Check()
         private void AddWebsiteUriToHistory(string websiteUri)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.HTTPHeaders_WebsiteUriHistory.ToList(), websiteUri, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.HTTPHeaders_WebsiteUriHistory.ToList(), websiteUri, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.HTTPHeaders_WebsiteUriHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
index 068e740cfa..1f089751ad 100644
--- a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
@@ -724,7 +724,7 @@ private void ScanFinished()
         private void AddIPRangeToHistory(string ipRange)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.IPScanner_IPRangeHistory.ToList(), ipRange, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.IPScanner_IPRangeHistory.ToList(), ipRange, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.IPScanner_IPRangeHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/LookupOUILookupViewModel.cs b/Source/NETworkManager/ViewModels/Applications/LookupOUILookupViewModel.cs
index cc62fa713b..e125cd541f 100644
--- a/Source/NETworkManager/ViewModels/Applications/LookupOUILookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/LookupOUILookupViewModel.cs
@@ -199,7 +199,7 @@ private void CopySelectedVendorAction()
         private void AddMACAddressOrVendorToHistory(string macAddressOrVendor)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.Lookup_OUI_MACAddressOrVendorHistory.ToList(), macAddressOrVendor, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.Lookup_OUI_MACAddressOrVendorHistory.ToList(), macAddressOrVendor, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.Lookup_OUI_MACAddressOrVendorHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/LookupPortViewModel.cs b/Source/NETworkManager/ViewModels/Applications/LookupPortViewModel.cs
index 07589a95fd..3670839b7c 100644
--- a/Source/NETworkManager/ViewModels/Applications/LookupPortViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/LookupPortViewModel.cs
@@ -255,7 +255,7 @@ private void CopySelectedDescriptionAction()
         private void AddPortOrServiceToHistory(string portOrService)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.Lookup_Port_PortsHistory.ToList(), portOrService, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.Lookup_Port_PortsHistory.ToList(), portOrService, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.Lookup_Port_PortsHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/PingViewModel.cs b/Source/NETworkManager/ViewModels/Applications/PingViewModel.cs
index 4b033320e8..3adca2324a 100644
--- a/Source/NETworkManager/ViewModels/Applications/PingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/PingViewModel.cs
@@ -417,7 +417,7 @@ private void PingFinished()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.Ping_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.Ping_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.Ping_HostHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs
index d432525727..e378151fba 100644
--- a/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs
@@ -821,7 +821,7 @@ private void CheckCanScanProfile()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.PortScanner_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.PortScanner_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.PortScanner_HostHistory.Clear();
@@ -834,7 +834,7 @@ private void AddHostToHistory(string host)
         private void AddPortToHistory(string port)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.PortScanner_PortHistory.ToList(), port, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.PortScanner_PortHistory.ToList(), port, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.PortScanner_PortHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/SNMPv1v2cViewModel.cs b/Source/NETworkManager/ViewModels/Applications/SNMPv1v2cViewModel.cs
index 6df73f1e1b..c3a858823d 100644
--- a/Source/NETworkManager/ViewModels/Applications/SNMPv1v2cViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/SNMPv1v2cViewModel.cs
@@ -428,7 +428,7 @@ private void QueryFinished()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SNMP_v1v2c_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SNMP_v1v2c_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SNMP_v1v2c_HostHistory.Clear();
@@ -441,7 +441,7 @@ private void AddHostToHistory(string host)
         private void AddOIDToHistory(string oid)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SNMP_v1v2c_OIDHistory.ToList(), oid, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SNMP_v1v2c_OIDHistory.ToList(), oid, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SNMP_v1v2c_OIDHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/SNMPv3ViewModel.cs b/Source/NETworkManager/ViewModels/Applications/SNMPv3ViewModel.cs
index 40cce85280..b09d916a69 100644
--- a/Source/NETworkManager/ViewModels/Applications/SNMPv3ViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/SNMPv3ViewModel.cs
@@ -499,7 +499,7 @@ private void QueryFinished()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SNMP_v3_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SNMP_v3_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SNMP_v3_HostHistory.Clear();
@@ -512,7 +512,7 @@ private void AddHostToHistory(string host)
         private void AddOIDToHistory(string oid)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SNMP_v3_OIDHistory.ToList(), oid, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SNMP_v3_OIDHistory.ToList(), oid, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SNMP_v3_OIDHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4CalculatorViewModel.cs b/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4CalculatorViewModel.cs
index de814955c4..1205fe17cd 100644
--- a/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4CalculatorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4CalculatorViewModel.cs
@@ -208,7 +208,7 @@ private void CalculateIPv4SubnetAction()
         private void AddSubnetToHistory(string subnet)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SubnetCalculator_IPv4Calculator_SubnetHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4SplitterViewModel.cs b/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4SplitterViewModel.cs
index 5b49ecc507..c44780b10b 100644
--- a/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4SplitterViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/SubnetCalculatorIPv4SplitterViewModel.cs
@@ -329,7 +329,7 @@ private void StopSplit()
         private void AddSubnetToHistory(string subnet)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Splitter_SubnetHistory.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Splitter_SubnetHistory.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SubnetCalculator_IPv4Splitter_SubnetHistory.Clear();
@@ -342,7 +342,7 @@ private void AddSubnetToHistory(string subnet)
         private void AddNewSubnetmaskOrCIDRToHistory(string newSubnetmaskOrCIDR)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory.ToList(), newSubnetmaskOrCIDR, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory.ToList(), newSubnetmaskOrCIDR, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Applications/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/Applications/TracerouteViewModel.cs
index 66d1864b40..fd3cc1afd1 100644
--- a/Source/NETworkManager/ViewModels/Applications/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Applications/TracerouteViewModel.cs
@@ -434,7 +434,7 @@ private void TracerouteFinished()
         private void AddHostToHistory(string host)
         {
             // Create the new list
-            List<string> list = HistoryListHelper.Modify(SettingsManager.Current.Traceroute_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
+            List<string> list = ListHelper.Modify(SettingsManager.Current.Traceroute_HostHistory.ToList(), host, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.Traceroute_HostHistory.Clear();
diff --git a/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs
index 47a3158fd1..27e30ee130 100644
--- a/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs
@@ -38,13 +38,30 @@ public string CustomDNSServer
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.DNSLookup_CustomDNSServer = value;
+                    SettingsManager.Current.DNSLookup_CustomDNSServer = value.Split(';').ToList();
 
                 _customDNSServer = value;
                 OnPropertyChanged();
             }
         }
 
+        private int _port;
+        public int Port
+        {
+            get { return _port;}
+            set
+            {
+                if (value == _port)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.DNSLookup_Port = value;
+
+                _port = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _addDNSSuffix;
         public bool AddDNSSuffix
         {
@@ -231,9 +248,13 @@ public SettingsApplicationDNSLookupViewModel()
         private void LoadSettings()
         {
             UseCustomDNSServer = SettingsManager.Current.DNSLookup_UseCustomDNSServer;
-            CustomDNSServer = SettingsManager.Current.DNSLookup_CustomDNSServer;            
+
+            if (SettingsManager.Current.DNSLookup_CustomDNSServer != null)
+                CustomDNSServer = string.Join("; ", SettingsManager.Current.DNSLookup_CustomDNSServer);
+
             AddDNSSuffix = SettingsManager.Current.DNSLookup_AddDNSSuffix;
             UseCustomDNSSuffix = SettingsManager.Current.DNSLookup_UseCustomDNSSuffix;
+            Port = SettingsManager.Current.DNSLookup_Port;
             CustomDNSSuffix = SettingsManager.Current.DNSLookup_CustomDNSSuffix;
             ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME;
             Recursion = SettingsManager.Current.DNSLookup_Recursion;
diff --git a/Source/NETworkManager/Views/Applications/DNSLookupView.xaml b/Source/NETworkManager/Views/Applications/DNSLookupView.xaml
index 6da4e0438b..aa9813defd 100644
--- a/Source/NETworkManager/Views/Applications/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/Applications/DNSLookupView.xaml
@@ -32,31 +32,31 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="0,0,0,10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="10" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="10" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="10" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Host}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                    <ComboBox x:Name="cbHost" Grid.Column="2" Grid.Row="0" Height="{Binding ElementName=cbType, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
-                        <ComboBox.Text>
-                            <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
-                                <Binding.ValidationRules>
-                                    <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
-                                </Binding.ValidationRules>
-                            </Binding>
-                        </ComboBox.Text>
-                    </ComboBox>
-                    <TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Type}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                    <ComboBox x:Name="cbType" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding Types}" SelectedItem="{Binding Type}" Width="200" HorizontalAlignment="Left" />
+            <Grid Grid.Row="0" Margin="0,0,0,10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="10" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Host}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
+                <ComboBox x:Name="cbHost" Grid.Column="2" Grid.Row="0" Height="{Binding ElementName=cbType, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                    <ComboBox.Text>
+                        <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </ComboBox.Text>
+                </ComboBox>
+                <TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Type}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
+                <ComboBox x:Name="cbType" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding Types}" SelectedItem="{Binding Type}" Width="200" HorizontalAlignment="Left" />
                 <Button Grid.Column="4" Grid.Row="2" Command="{Binding LookupCommand}" IsDefault="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" HorizontalAlignment="Right">
                     <Button.Resources>
                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
@@ -177,6 +177,28 @@
                     </Style.Triggers>
                 </Style>
             </DataGrid.RowStyle>
+            <DataGrid.GroupStyle>
+                <GroupStyle>
+                    <GroupStyle.ContainerStyle>
+                        <Style TargetType="{x:Type GroupItem}">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type GroupItem}">
+                                        <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
+                                            <Expander.Header>
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Name}" FontSize="18" Margin="0" Style="{DynamicResource HeaderTextBlock}" />
+                                                </StackPanel>
+                                            </Expander.Header>
+                                            <ItemsPresenter />
+                                        </Expander>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </GroupStyle.ContainerStyle>
+                </GroupStyle>
+            </DataGrid.GroupStyle>
             <DataGrid.Columns>
                 <DataGridTextColumn Header="{DynamicResource String_Name}" Binding="{Binding Name}" MinWidth="150" />
                 <DataGridTextColumn Header="{DynamicResource String_TTL}" Binding="{Binding TTL}" MinWidth="80" />
@@ -185,7 +207,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Result}" Binding="{Binding Result}" MinWidth="200" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
@@ -194,12 +216,6 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="10" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="10" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -220,18 +236,6 @@
                     <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="{DynamicResource String_EndTime}" />
                     <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding EndTime, Converter={StaticResource NullableDateTimeToStringConverter}}" />
-                    <TextBlock Grid.Column="3" Grid.Row="0" Text="{DynamicResource String_DNSServer}" />
-                    <TextBox Grid.Column="4" Grid.Row="0" Text="{Binding DNSServerAndPort, Converter={StaticResource NullOrEmptyToStringConverter}}"/>
-                    <TextBlock Grid.Column="3" Grid.Row="1" Text="{DynamicResource String_Questions}" />
-                    <TextBox Grid.Column="4" Grid.Row="1" Text="{Binding Questions, Converter={StaticResource IntToStringConverter}}" />
-                    <TextBlock Grid.Column="3" Grid.Row="2" Text="{DynamicResource String_Answers}" />
-                    <TextBox Grid.Column="4" Grid.Row="2" Text="{Binding Answers, Converter={StaticResource IntToStringConverter}}" />
-                    <TextBlock Grid.Column="6" Grid.Row="0" Text="{DynamicResource String_Authorities}" />
-                    <TextBox Grid.Column="7" Grid.Row="0" Text="{Binding Authorities, Converter={StaticResource IntToStringConverter}}" />
-                    <TextBlock Grid.Column="6" Grid.Row="1" Text="{DynamicResource String_Additionals}" />
-                    <TextBox Grid.Column="7" Grid.Row="1" Text="{Binding Additionals, Converter={StaticResource IntToStringConverter}}" />
-                    <TextBlock Grid.Column="6" Grid.Row="2" Text="{DynamicResource String_MessageSize}" />
-                    <TextBox Grid.Column="7" Grid.Row="2" Text="{Binding MessageSize, Converter={StaticResource IntToStringConverter}}" />
                 </Grid>
             </StackPanel>
         </Expander>
diff --git a/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml b/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml
index 2ce8553796..43c87f8207 100644
--- a/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml
+++ b/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml
@@ -100,7 +100,7 @@
             </Grid>
             <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Headers}" />
             <TextBox Grid.Row="3" Text="{Binding Headers}" Style="{StaticResource DefaultTextBox}" FontFamily="Consolas" IsReadOnly="True" VerticalContentAlignment="Top" ContextMenu="{StaticResource CopyContextMenu}" Margin="0,0,0,20"/>
-            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
                 <Expander.Header>
                     <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
                 </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/IPScannerView.xaml b/Source/NETworkManager/Views/Applications/IPScannerView.xaml
index 51967012d4..c6c9853f96 100644
--- a/Source/NETworkManager/Views/Applications/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/Applications/IPScannerView.xaml
@@ -279,7 +279,7 @@
                     <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding PingInfo.Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" />
                 </DataGrid.Columns>
             </DataGrid>
-            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
                 <Expander.Header>
                     <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
                 </Expander.Header>
@@ -390,7 +390,7 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate>
-                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}" Padding="0">
+                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
                                                         <Expander.Header>
                                                             <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlock}" FontSize="18" Margin="0" />
                                                         </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/PingView.xaml b/Source/NETworkManager/Views/Applications/PingView.xaml
index aaaa10a178..514f7e86db 100644
--- a/Source/NETworkManager/Views/Applications/PingView.xaml
+++ b/Source/NETworkManager/Views/Applications/PingView.xaml
@@ -138,9 +138,9 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150"/>
             </Control:ScrollingDataGrid.Columns>
         </Control:ScrollingDataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
             <Expander.Header>
-                <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
+                <TextBlock Text="{DynamicResource String_Header_Destination}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
             <Grid Margin="0,10,0,0">
                 <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/Applications/PortScannerView.xaml b/Source/NETworkManager/Views/Applications/PortScannerView.xaml
index 3cfef84d01..a082552ef3 100644
--- a/Source/NETworkManager/Views/Applications/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/Applications/PortScannerView.xaml
@@ -279,7 +279,7 @@
                     <DataGridTextColumn Header="{DynamicResource String_Description}" Binding="{Binding LookupInfo.Description}" MinWidth="200" />
                 </DataGrid.Columns>
             </DataGrid>
-            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
                 <Expander.Header>
                     <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
                 </Expander.Header>
@@ -390,7 +390,7 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate>
-                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}" Padding="0">
+                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
                                                         <Expander.Header>
                                                             <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlock}" FontSize="18" Margin="0" />
                                                         </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml b/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml
index 96b800723a..3a99c5d669 100644
--- a/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml
+++ b/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml
@@ -134,7 +134,7 @@
                                             <Setter Property="Template">
                                                 <Setter.Value>
                                                     <ControlTemplate>
-                                                        <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}" Padding="0">
+                                                        <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
                                                             <Expander.Header>
                                                                 <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlock}" FontSize="18" Margin="0" />
                                                             </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/SNMPv1v2cView.xaml b/Source/NETworkManager/Views/Applications/SNMPv1v2cView.xaml
index ba07391d0b..97696baea1 100644
--- a/Source/NETworkManager/Views/Applications/SNMPv1v2cView.xaml
+++ b/Source/NETworkManager/Views/Applications/SNMPv1v2cView.xaml
@@ -195,7 +195,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Data}" Binding="{Binding Data}" MinWidth="300" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/SNMPv3View.xaml b/Source/NETworkManager/Views/Applications/SNMPv3View.xaml
index 87cefbfecb..53bf47e13f 100644
--- a/Source/NETworkManager/Views/Applications/SNMPv3View.xaml
+++ b/Source/NETworkManager/Views/Applications/SNMPv3View.xaml
@@ -314,7 +314,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Data}" Binding="{Binding Data}" MinWidth="300" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/TracerouteView.xaml b/Source/NETworkManager/Views/Applications/TracerouteView.xaml
index 14fc9d11a8..3adadaee9a 100644
--- a/Source/NETworkManager/Views/Applications/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/Applications/TracerouteView.xaml
@@ -219,7 +219,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Hostname}" Binding="{Binding Hostname}" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityConverter}}" MinWidth="150"/>
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml b/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
index 88cfbd2efe..28d2a12f03 100644
--- a/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
+++ b/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
@@ -187,7 +187,7 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate>
-                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}" Padding="0">
+                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
                                                         <Expander.Header>
                                                             <TextBlock Text="{Binding Name}" Style="{StaticResource HeaderTextBlock}" FontSize="18" Margin="0" />
                                                         </Expander.Header>
diff --git a/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml b/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml
index b25ac8f2d1..e1c1b46723 100644
--- a/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml
+++ b/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml
@@ -9,12 +9,24 @@
     <StackPanel>
         <TextBlock Text="{DynamicResource String_Header_DNSLookup}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{DynamicResource String_UseCustomDNSServer}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding UseCustomDNSServer}" Margin="0,0,0,10"/>
-        <TextBox Width="250" HorizontalAlignment="Left"  Margin="0,0,0,10" IsEnabled="{Binding UseCustomDNSServer}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPv4DNSServer}" Style="{StaticResource DefaultTextBox}">
+        <TextBlock Text="{DynamicResource String_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="{DynamicResource String_Watermark_ExampleIPv4DNSServers}" Style="{StaticResource DefaultTextBox}">
             <TextBox.Text>
                 <Binding Path="CustomDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
                         <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
-                        <Validator:IPAddressValidator ValidatesOnTargetUpdated="True" />
+                        <Validator:MultipleIPAddressesValidator ValidatesOnTargetUpdated="True" />
+                    </Binding.ValidationRules>
+                </Binding>
+            </TextBox.Text>
+        </TextBox>
+        <TextBlock Text="{DynamicResource String_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="{DynamicResource String_Watermark_ExamplePort53}" Style="{StaticResource DefaultTextBox}">
+            <TextBox.Text>
+                <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                    <Binding.ValidationRules>
+                        <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
+                        <Validator:PortValidator ValidatesOnTargetUpdated="True" />
                     </Binding.ValidationRules>
                 </Binding>
             </TextBox.Text>