diff --git a/src/SetupProject/Product.wxs b/src/SetupProject/Product.wxs
index 5402d74..5e22abe 100644
--- a/src/SetupProject/Product.wxs
+++ b/src/SetupProject/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define Sysadmin_TargetDir=$(var.Sysadmin.TargetDir)?>
-	<Product Id="*" Name="Sysadmin" Language="1033" Version="10.2.0.0" Manufacturer="Sysadmin Anywhere" UpgradeCode="ef8f7793-3a07-4cbb-ac9b-52eff7e8fb22">
+	<Product Id="*" Name="Sysadmin" Language="1033" Version="10.3.0.0" Manufacturer="Sysadmin Anywhere" UpgradeCode="ef8f7793-3a07-4cbb-ac9b-52eff7e8fb22">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
diff --git a/src/SysAdmin.ActiveDirectory/ADAttribute.cs b/src/SysAdmin.ActiveDirectory/ADAttribute.cs
index f294861..c20157b 100644
--- a/src/SysAdmin.ActiveDirectory/ADAttribute.cs
+++ b/src/SysAdmin.ActiveDirectory/ADAttribute.cs
@@ -1,5 +1,6 @@
 namespace SysAdmin.ActiveDirectory
 {
+    [AttributeUsage(AttributeTargets.All, Inherited = true)]
     public class ADAttribute : Attribute
     {
 
diff --git a/src/SysAdmin.ActiveDirectory/ADContainers.cs b/src/SysAdmin.ActiveDirectory/ADContainers.cs
index 9b66343..1e58f47 100644
--- a/src/SysAdmin.ActiveDirectory/ADContainers.cs
+++ b/src/SysAdmin.ActiveDirectory/ADContainers.cs
@@ -4,19 +4,19 @@ namespace SysAdmin.ActiveDirectory
 {
     public class ADContainers
     {
-        private const string ContainerMicrosoft = "B:32:F4BE92A4C777485E878E9421D53087DB:";                 //CN=Microsoft,CN=Program Data,DC=example,DC=com
-        private const string ContainerProgramData = "B:32:09460C08AE1E4A4EA0F64AEE7DAA1E5A:";               //CN=Program Data,DC=example,DC=com
-        private const string ContainerForeignSecurityPrincipals = "B:32:22B70C67D56E4EFB91E9300FCA3DC1AA:"; //CN=ForeignSecurityPrincipals,DC=example,DC=com
-        private const string ContainerDeletedObjects = "B:32:18E2EA80684F11D2B9AA00C04F79F805:";            //CN=Deleted Objects,DC=example,DC=com
-        private const string ContainerInfrastructure = "B:32:2FBAC1870ADE11D297C400C04FD8D5CD:";            //CN=Infrastructure,DC=example,DC=com
-        private const string ContainerLostAndFound = "B:32:AB8153B7768811D1ADED00C04FD8D5CD:";              //CN=LostAndFound,DC=example,DC=com
-        private const string ContainerSystem = "B:32:AB1D30F3768811D1ADED00C04FD8D5CD:";                    //CN=System,DC=example,DC=com
-        private const string ContainerDomainControllers = "B:32:A361B2FFFFD211D1AA4B00C04FD7D83A:";         //OU=Domain Controllers,DC=example,DC=com
-        private const string ContainerComputers = "B:32:AA312825768811D1ADED00C04FD8D5CD:";                 //CN=Computers,DC=example,DC=com
-        private const string ContainerUsers = "B:32:A9D1CA15768811D1ADED00C04FD8D5CD:";                     //CN=Users,DC=example,DC=com
-        private const string ContainerNTDSQuotas = "B:32:6227F0AF1FC2410D8E3BB10615BB5B0F:";                //CN=NTDS Quotas,DC=example,DC=com
+        private const string ContainerMicrosoft = "B:32:F4BE92A4C777485E878E9421D53087DB:";                 //NOSONAR CN=Microsoft,CN=Program Data,DC=example,DC=com
+        private const string ContainerProgramData = "B:32:09460C08AE1E4A4EA0F64AEE7DAA1E5A:";               //NOSONAR CN=Program Data,DC=example,DC=com
+        private const string ContainerForeignSecurityPrincipals = "B:32:22B70C67D56E4EFB91E9300FCA3DC1AA:"; //NOSONAR CN=ForeignSecurityPrincipals,DC=example,DC=com
+        private const string ContainerDeletedObjects = "B:32:18E2EA80684F11D2B9AA00C04F79F805:";            //NOSONAR CN=Deleted Objects,DC=example,DC=com
+        private const string ContainerInfrastructure = "B:32:2FBAC1870ADE11D297C400C04FD8D5CD:";            //NOSONAR CN=Infrastructure,DC=example,DC=com
+        private const string ContainerLostAndFound = "B:32:AB8153B7768811D1ADED00C04FD8D5CD:";              //NOSONAR CN=LostAndFound,DC=example,DC=com
+        private const string ContainerSystem = "B:32:AB1D30F3768811D1ADED00C04FD8D5CD:";                    //NOSONAR CN=System,DC=example,DC=com
+        private const string ContainerDomainControllers = "B:32:A361B2FFFFD211D1AA4B00C04FD7D83A:";         //NOSONAR OU=Domain Controllers,DC=example,DC=com
+        private const string ContainerComputers = "B:32:AA312825768811D1ADED00C04FD8D5CD:";                 //NOSONAR CN=Computers,DC=example,DC=com
+        private const string ContainerUsers = "B:32:A9D1CA15768811D1ADED00C04FD8D5CD:";                     //NOSONAR CN=Users,DC=example,DC=com
+        private const string ContainerNTDSQuotas = "B:32:6227F0AF1FC2410D8E3BB10615BB5B0F:";                //NOSONAR CN=NTDS Quotas,DC=example,DC=com
 
-        private List<string> wellKnownObjects;
+        private readonly List<string> wellKnownObjects;
 
         public ADContainers(LdapService ldapService)
         {
diff --git a/src/SysAdmin.ActiveDirectory/ADHelper.cs b/src/SysAdmin.ActiveDirectory/ADHelper.cs
index 17baedd..e8a3f60 100644
--- a/src/SysAdmin.ActiveDirectory/ADHelper.cs
+++ b/src/SysAdmin.ActiveDirectory/ADHelper.cs
@@ -10,12 +10,12 @@ public static class ADHelper
     {
         public static string ExtractCN(string dn)
         {
-            string[] parts = dn.Split(new char[] { ',' });
+            string[] parts = dn.Split(",");
 
             for (int i = 0; i < parts.Length; i++)
             {
                 var p = parts[i];
-                var elems = p.Split(new char[] { '=' });
+                var elems = p.Split("=");
                 var t = elems[0].Trim().ToUpper();
                 var v = elems[1].Trim();
                 if (t == "CN")
diff --git a/src/SysAdmin.ActiveDirectory/ADResolver.cs b/src/SysAdmin.ActiveDirectory/ADResolver.cs
index 96139a6..900b07e 100644
--- a/src/SysAdmin.ActiveDirectory/ADResolver.cs
+++ b/src/SysAdmin.ActiveDirectory/ADResolver.cs
@@ -26,7 +26,7 @@ public static T GetValues(LdapEntry entry)
 
                 var attributes = (ADAttribute[])property.GetCustomAttributes(typeof(ADAttribute), true);
 
-                if (attributes.Count() > 0)
+                if (attributes != null && attributes.Any())
                 {
                     propertyName = attributes[0].Name;
                     dateType = attributes[0].DateType;
@@ -35,7 +35,7 @@ public static T GetValues(LdapEntry entry)
                 try
                 {
 
-                    var attribute = directoryAttributes.Where(a => a.Name.ToLower() == propertyName.ToLower()).FirstOrDefault();
+                    var attribute = directoryAttributes.FirstOrDefault(a => a.Name.ToLower() == propertyName.ToLower());
 
                     if (attribute != null)
                     {
diff --git a/src/Sysadmin/App.xaml.cs b/src/Sysadmin/App.xaml.cs
index 8255711..edd11fa 100644
--- a/src/Sysadmin/App.xaml.cs
+++ b/src/Sysadmin/App.xaml.cs
@@ -162,9 +162,9 @@ private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledEx
             // For more info see https://docs.microsoft.com/en-us/dotnet/api/system.windows.application.dispatcherunhandledexception?view=windowsdesktop-6.0
         }
 
-        public static IServer SERVER = null;
-        public static ICredential CREDENTIAL = null;
-        public static ADContainers CONTAINERS = null;
+        public static IServer? SERVER = null;           //NOSONAR
+        public static ICredential? CREDENTIAL = null;   //NOSONAR
+        public static ADContainers? CONTAINERS = null;  //NOSONAR
 
     }
 }
\ No newline at end of file
diff --git a/src/Sysadmin/Controls/MemberOfControl.xaml b/src/Sysadmin/Controls/MemberOfControl.xaml
index 6fc2f38..7851b61 100644
--- a/src/Sysadmin/Controls/MemberOfControl.xaml
+++ b/src/Sysadmin/Controls/MemberOfControl.xaml
@@ -18,7 +18,7 @@
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0">
-                <TextBlock Text="Member of" Margin="0,8,8,8" HorizontalAlignment="Left" FontWeight="Bold"/>
+                <TextBlock Text="Member of" Margin="0" HorizontalAlignment="Left" FontWeight="Bold"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button x:Name="addButton" Content="+" Click="addButton_Click"/>
                     <Button x:Name="deleteButton" Content="-" IsEnabled="False" Click="deleteButton_Click"/>
diff --git a/src/Sysadmin/Controls/MemberOfControl.xaml.cs b/src/Sysadmin/Controls/MemberOfControl.xaml.cs
index 3704367..d067cb2 100644
--- a/src/Sysadmin/Controls/MemberOfControl.xaml.cs
+++ b/src/Sysadmin/Controls/MemberOfControl.xaml.cs
@@ -101,7 +101,7 @@ public int PrimaryGroupId
                 SetValue(PrimaryGroupIdProperty, value);
                 if (value != 0)
                 {
-                    string group = SysAdmin.ActiveDirectory.ADHelper.GetPrimaryGroup(value);
+                    string group = ADHelper.GetPrimaryGroup(value);
                     if (!string.IsNullOrEmpty(group))
                         if (Items.FirstOrDefault(c => c.Name == group) == null)
                             Items.Add(new MemberItem() { Name = group, DistinguishedName = string.Empty });
@@ -114,11 +114,11 @@ private void Update(List<string> value)
             Items.Clear();
             if (value != null)
                 foreach (string item in value)
-                    Items.Add(new MemberItem() { Name = SysAdmin.ActiveDirectory.ADHelper.ExtractCN(item), DistinguishedName = item });
+                    Items.Add(new MemberItem() { Name = ADHelper.ExtractCN(item), DistinguishedName = item });
 
             if (PrimaryGroupId != 0)
             {
-                string group = SysAdmin.ActiveDirectory.ADHelper.GetPrimaryGroup(PrimaryGroupId);
+                string group = ADHelper.GetPrimaryGroup(PrimaryGroupId);
                 if (!string.IsNullOrEmpty(group))
                     Items.Add(new MemberItem() { Name = group, DistinguishedName = string.Empty });
             }
@@ -147,7 +147,7 @@ private void addButton_Click(object sender, RoutedEventArgs e)
             selectControl.Load(SelectControl.Show.Groups);
         }
 
-        private async void deleteButton_Click(object sender, RoutedEventArgs e)
+        private async void deleteButton_Click(object sender, RoutedEventArgs e) //NOSONAR
         {
             try
             {
@@ -206,7 +206,7 @@ await Task.Run(async () =>
             });
         }
 
-        private async void selectControl_SelectedItem(MemberItem item)
+        private async void selectControl_SelectedItem(MemberItem item) //NOSONAR
         {
             flyout.Hide();
 
diff --git a/src/Sysadmin/Controls/MembersControl.xaml b/src/Sysadmin/Controls/MembersControl.xaml
index 77f1c96..142eb91 100644
--- a/src/Sysadmin/Controls/MembersControl.xaml
+++ b/src/Sysadmin/Controls/MembersControl.xaml
@@ -18,7 +18,7 @@
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0">
-                <TextBlock Text="Members" Margin="0,8,8,8" HorizontalAlignment="Left" FontWeight="Bold" VerticalAlignment="Top"/>
+                <TextBlock Text="Members" Margin="0" HorizontalAlignment="Left" FontWeight="Bold" VerticalAlignment="Top"/>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button x:Name="addButton" Content="+" Click="addButton_Click"/>
                     <Button x:Name="deleteButton" Content="-" IsEnabled="False" Click="deleteButton_Click"/>
diff --git a/src/Sysadmin/Controls/MembersControl.xaml.cs b/src/Sysadmin/Controls/MembersControl.xaml.cs
index 8d12f1d..6572173 100644
--- a/src/Sysadmin/Controls/MembersControl.xaml.cs
+++ b/src/Sysadmin/Controls/MembersControl.xaml.cs
@@ -101,7 +101,7 @@ private void addButton_Click(object sender, RoutedEventArgs e)
             selectControl.Load(SelectControl.Show.All);
         }
 
-        private async void deleteButton_Click(object sender, RoutedEventArgs e)
+        private async void deleteButton_Click(object sender, RoutedEventArgs e) //NOSONAR
         {
             try
             {
@@ -161,7 +161,7 @@ await Task.Run(async () =>
         }
 
 
-        private async void selectControl_SelectedItem(MemberItem item)
+        private async void selectControl_SelectedItem(MemberItem item) //NOSONAR
         {
             flyout.Hide();
 
diff --git a/src/Sysadmin/Controls/PersonPictureControl.xaml b/src/Sysadmin/Controls/PersonPictureControl.xaml
new file mode 100644
index 0000000..b77b5a4
--- /dev/null
+++ b/src/Sysadmin/Controls/PersonPictureControl.xaml
@@ -0,0 +1,22 @@
+<UserControl xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"  x:Class="Sysadmin.Controls.PersonPictureControl"
+             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:local="clr-namespace:Sysadmin.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="100" d:DesignWidth="100">
+    <Grid>
+        <Ellipse Fill="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" />
+        <Viewbox>
+            <TextBlock Margin="4" Text="PP" x:Name="initials" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+        </Viewbox>
+        <Viewbox>
+            <Image x:Name="pictureImage" RenderOptions.BitmapScalingMode="HighQuality" Width="100" Height="100">
+                <Image.Clip>
+                    <EllipseGeometry Center="50,50" RadiusX="50" RadiusY="50" />
+                </Image.Clip>
+            </Image>
+        </Viewbox>
+    </Grid>
+</UserControl>
diff --git a/src/Sysadmin/Controls/PersonPictureControl.xaml.cs b/src/Sysadmin/Controls/PersonPictureControl.xaml.cs
new file mode 100644
index 0000000..fb664a8
--- /dev/null
+++ b/src/Sysadmin/Controls/PersonPictureControl.xaml.cs
@@ -0,0 +1,106 @@
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Sysadmin.Controls
+{
+    /// <summary>
+    /// Interaction logic for PersonPictureControl.xaml
+    /// </summary>
+    public partial class PersonPictureControl : UserControl
+    {
+
+        public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register(
+            "DisplayName", typeof(string),
+            typeof(PersonPictureControl)
+            );
+
+        public string DisplayName
+        {
+            get => (string)GetValue(DisplayNameProperty);
+            set
+            {
+                SetValue(DisplayNameProperty, value);
+                initials.Text = GetInitials(value);
+            }
+        }
+
+        public static readonly DependencyProperty ProfilePictureProperty = DependencyProperty.Register(
+            "ProfilePicture", typeof(ImageSource),
+            typeof(PersonPictureControl)
+            );
+
+        public ImageSource ProfilePicture
+        {
+            get => (ImageSource)GetValue(ProfilePictureProperty);
+            set
+            {
+                SetValue(ProfilePictureProperty, value);
+                pictureImage.Source = value;
+            }
+        }
+
+        private byte[] jpegPhoto;
+
+        public byte[] JpegPhoto
+        {
+            get { return jpegPhoto; }
+            set
+            {
+                jpegPhoto = value;
+                ShowPhoto();
+            }
+        }
+
+        public PersonPictureControl()
+        {
+            InitializeComponent();
+        }
+
+        private string GetInitials(string name)
+        {
+
+            if (string.IsNullOrEmpty(name))
+                return string.Empty;
+
+            string[] nameSplit = name.Split(new string[] { ",", " " }, StringSplitOptions.RemoveEmptyEntries);
+
+            string initials = "";
+
+            foreach (string item in nameSplit)
+            {
+                initials += item.Substring(0, 1).ToUpper();
+            }
+
+            return initials;
+        }
+
+        private void ShowPhoto()
+        {
+            if (JpegPhoto != null && JpegPhoto.Length > 0)
+            {
+                var image = new BitmapImage();
+                using (var mem = new MemoryStream(JpegPhoto))
+                {
+                    mem.Position = 0;
+                    image.BeginInit();
+                    image.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
+                    image.CacheOption = BitmapCacheOption.OnLoad;
+                    image.UriSource = null;
+                    image.StreamSource = mem;
+                    image.EndInit();
+                }
+                image.Freeze();
+                pictureImage.Source = image;
+            }
+            else
+            {
+                pictureImage.Source = null;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Sysadmin/Services/ISettingsService.cs b/src/Sysadmin/Services/ISettingsService.cs
index d2c0782..d0b6100 100644
--- a/src/Sysadmin/Services/ISettingsService.cs
+++ b/src/Sysadmin/Services/ISettingsService.cs
@@ -36,5 +36,9 @@ public interface ISettingsService
 
         bool LoginUseCredentials { get; set; }
 
+        string VNCPath { get; set; }
+
+        int VNCPort { get; set; }
+
     }
 }
\ No newline at end of file
diff --git a/src/Sysadmin/Services/SettingsService.cs b/src/Sysadmin/Services/SettingsService.cs
index 6d86be4..70f1234 100644
--- a/src/Sysadmin/Services/SettingsService.cs
+++ b/src/Sysadmin/Services/SettingsService.cs
@@ -113,6 +113,26 @@ public bool LoginUseCredentials
             set { SetValue("LoginUseCredentials", value); }
         }
 
+        public string VNCPath
+        {
+            get
+            {
+                return GetStringValue("VNCPath", "C:\\Program Files\\TightVNC\\tvnviewer.exe");
+            }
+            set { SetValue("VNCPath", value); }
+        }
+
+        public int VNCPort
+        {
+            get
+            {
+                return GetIntValue("VNCPort", 5900);
+            }
+            set { SetValue("VNCPort", value); }
+        }
+
+
+
         public void LoadSettings()
         {
             try
diff --git a/src/Sysadmin/Styles.xaml b/src/Sysadmin/Styles.xaml
index dd523ea..d2c3596 100644
--- a/src/Sysadmin/Styles.xaml
+++ b/src/Sysadmin/Styles.xaml
@@ -70,6 +70,7 @@
     </Style>
 
     <Style x:Key="ListDescriptionStyle" TargetType="TextBlock">
+        <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
         <Setter Property="Margin" Value="6,0,0,6" />
         <Setter Property="VerticalAlignment" Value="Center" />
diff --git a/src/Sysadmin/Sysadmin.csproj b/src/Sysadmin/Sysadmin.csproj
index 8a12cb2..8663b3e 100644
--- a/src/Sysadmin/Sysadmin.csproj
+++ b/src/Sysadmin/Sysadmin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -9,9 +9,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>applicationIcon.ico</ApplicationIcon>
     <Title>Sysadmin</Title>
-	<AssemblyVersion>10.2.0</AssemblyVersion>
-	<Version>10.2.0</Version>
-	<FileVersion>10.2.0</FileVersion>
+	<AssemblyVersion>10.3.0</AssemblyVersion>
+	<Version>10.3.0</Version>
+	<FileVersion>10.3.0</FileVersion>
 	<Copyright>Copyright 2015-2023 Sysadmin Anywhere - All Rights Reserved</Copyright>
 	<Company>Sysadmin Anywhere</Company>
 	<Authors>Sysadmin Anywhere</Authors>
diff --git a/src/Sysadmin/ToDo.txt b/src/Sysadmin/ToDo.txt
index 8616795..b4c1f89 100644
--- a/src/Sysadmin/ToDo.txt
+++ b/src/Sysadmin/ToDo.txt
@@ -48,3 +48,9 @@
 10. Autoupdater.NET
 	+ Version
 	+ XML
+11. Remote desktop
+	+ VNC
+	+ RDP
+12. Member of
+	+ User
+	+ Computer
diff --git a/src/Sysadmin/ViewModels/Computers/ComputerViewModel.cs b/src/Sysadmin/ViewModels/Computers/ComputerViewModel.cs
index b05c609..ed4b525 100644
--- a/src/Sysadmin/ViewModels/Computers/ComputerViewModel.cs
+++ b/src/Sysadmin/ViewModels/Computers/ComputerViewModel.cs
@@ -202,6 +202,25 @@ await Task.Run(() =>
             }
         }
 
+        public async Task Get()
+        {
+            ComputerEntry entry = Computer;
+
+            await Task.Run(async () =>
+            {
+                using (var ldap = new LdapService(App.SERVER, App.CREDENTIAL))
+                {
+                    using (var computersRepository = new ComputersRepository(ldap))
+                    {
+                        entry = await computersRepository.GetByCNAsync(Computer.CN);
+                    }
+                }
+            });
+
+            Computer = entry;
+        }
+
+
     }
 
 }
\ No newline at end of file
diff --git a/src/Sysadmin/ViewModels/Computers/ComputersViewModel.cs b/src/Sysadmin/ViewModels/Computers/ComputersViewModel.cs
index 8532cdb..4cda314 100644
--- a/src/Sysadmin/ViewModels/Computers/ComputersViewModel.cs
+++ b/src/Sysadmin/ViewModels/Computers/ComputersViewModel.cs
@@ -53,6 +53,8 @@ public async void OnNavigatedTo()
                 InitializeViewModel();
 
             await ListAsync();
+
+            SortingAndFiltering();
         }
 
         public void OnNavigatedFrom()
diff --git a/src/Sysadmin/ViewModels/Contacts/ContactsViewModel.cs b/src/Sysadmin/ViewModels/Contacts/ContactsViewModel.cs
index bed6420..6d1feae 100644
--- a/src/Sysadmin/ViewModels/Contacts/ContactsViewModel.cs
+++ b/src/Sysadmin/ViewModels/Contacts/ContactsViewModel.cs
@@ -43,6 +43,8 @@ public async void OnNavigatedTo()
                 InitializeViewModel();
 
             await ListAsync();
+
+            SortingAndFiltering();
         }
 
         public void OnNavigatedFrom()
diff --git a/src/Sysadmin/ViewModels/Groups/GroupsViewModel.cs b/src/Sysadmin/ViewModels/Groups/GroupsViewModel.cs
index 0b4f555..75a0ea2 100644
--- a/src/Sysadmin/ViewModels/Groups/GroupsViewModel.cs
+++ b/src/Sysadmin/ViewModels/Groups/GroupsViewModel.cs
@@ -58,6 +58,8 @@ public async void OnNavigatedTo()
                 InitializeViewModel();
 
             await ListAsync();
+
+            SortingAndFiltering();
         }
 
         public void OnNavigatedFrom()
diff --git a/src/Sysadmin/ViewModels/Printers/PrintersViewModel.cs b/src/Sysadmin/ViewModels/Printers/PrintersViewModel.cs
index 7f077e3..f005ecc 100644
--- a/src/Sysadmin/ViewModels/Printers/PrintersViewModel.cs
+++ b/src/Sysadmin/ViewModels/Printers/PrintersViewModel.cs
@@ -43,6 +43,8 @@ public async void OnNavigatedTo()
                 InitializeViewModel();
 
             await ListAsync();
+
+            SortingAndFiltering();
         }
 
         public void OnNavigatedFrom()
diff --git a/src/Sysadmin/ViewModels/Users/UserViewModel.cs b/src/Sysadmin/ViewModels/Users/UserViewModel.cs
index ba160a8..c6468c0 100644
--- a/src/Sysadmin/ViewModels/Users/UserViewModel.cs
+++ b/src/Sysadmin/ViewModels/Users/UserViewModel.cs
@@ -144,5 +144,24 @@ await Task.Run(async () =>
             });
 
         }
+
+        public async Task Get()
+        {
+            UserEntry entry = User;
+
+            await Task.Run(async () =>
+            {
+                using (var ldap = new LdapService(App.SERVER, App.CREDENTIAL))
+                {
+                    using (var usersRepository = new UsersRepository(ldap))
+                    {
+                        entry = await usersRepository.GetByCNAsync(User.CN);
+                    }
+                }
+            });
+
+            User = entry;
+        }
+
     }
-}
+}
\ No newline at end of file
diff --git a/src/Sysadmin/ViewModels/Users/UsersViewModel.cs b/src/Sysadmin/ViewModels/Users/UsersViewModel.cs
index 5b7deb5..2d46855 100644
--- a/src/Sysadmin/ViewModels/Users/UsersViewModel.cs
+++ b/src/Sysadmin/ViewModels/Users/UsersViewModel.cs
@@ -56,6 +56,8 @@ public async void OnNavigatedTo()
                 InitializeViewModel();
 
             await ListAsync();
+
+            SortingAndFiltering();
         }
 
         public void OnNavigatedFrom()
diff --git a/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml b/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml
index 795d7c9..1c31b2e 100644
--- a/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml
+++ b/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Sysadmin.Views.Pages"
+    xmlns:controls="clr-namespace:Sysadmin.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:converters="clr-namespace:Sysadmin.Converters"
     xmlns:models="clr-namespace:Sysadmin.Models"
@@ -131,6 +132,29 @@
                     </ui:MenuItem>
                 </ui:MenuItem>
                 <Separator />
+                <ui:MenuItem>
+                    <ui:MenuItem.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock>Remote desktop</TextBlock>
+                            <ui:SymbolIcon Symbol="ChevronDown20" Margin="4,0,0,0" />
+                        </StackPanel>
+                    </ui:MenuItem.Header>
+                    <ui:MenuItem x:Name="rdp" Click="rdp_Click">
+                        <ui:MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock>RDP (Remote Desktop Protocol)</TextBlock>
+                            </StackPanel>
+                        </ui:MenuItem.Header>
+                    </ui:MenuItem>
+                    <ui:MenuItem x:Name="vnc" Click="vnc_Click">
+                        <ui:MenuItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock>VNC (Virtual Network Computing)</TextBlock>
+                            </StackPanel>
+                        </ui:MenuItem.Header>
+                    </ui:MenuItem>
+                </ui:MenuItem>
+                <Separator />
                 <ui:MenuItem Click="DeleteMenuItem_Click">
                     <ui:MenuItem.Header>
                         <StackPanel Orientation="Horizontal">
@@ -142,36 +166,53 @@
             </Menu>
         </Grid>
 
-        <Grid 
-            VerticalAlignment="Top"
-            Grid.Row="1" 
-            Margin="24">
+        <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-            </Grid.RowDefinitions>
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}" Grid.Row="0" Grid.Column="0" Text="Location" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="0" Grid.Column="1" Text="{Binding ViewModel.Computer.Location, Mode=OneWay}" />
+            <Grid 
+                Grid.Column="0"
+                VerticalAlignment="Top"
+                Margin="24">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}" Grid.Row="0" Grid.Column="0" Text="Location" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="0" Grid.Column="1" Text="{Binding ViewModel.Computer.Location, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="1" Grid.Column="0" Text="Host name" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="1" Grid.Column="1" Text="{Binding ViewModel.Computer.DnsHostName, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="2" Grid.Column="0" Text="Operating system" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="2" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystem, Mode=OneWay}" />
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="1" Grid.Column="0" Text="Host name" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="1" Grid.Column="1" Text="{Binding ViewModel.Computer.DnsHostName, Mode=OneWay}" />
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="3" Grid.Column="0" Text="Version" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="3" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystemVersion, Mode=OneWay}" />
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="2" Grid.Column="0" Text="Operating system" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="2" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystem, Mode=OneWay}" />
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="4" Grid.Column="0" Text="Service pack" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="4" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystemServicePack, Mode=OneWay}" />
+            </Grid>
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="3" Grid.Column="0" Text="Version" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="3" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystemVersion, Mode=OneWay}" />
+            <controls:MemberOfControl 
+                Grid.Column="1"
+                x:Name="memberOf"
+                MemberOf="{Binding ViewModel.Computer.MemberOf, Mode=OneWay}"
+                PrimaryGroupId="{Binding ViewModel.Computer.PrimaryGroupId, Mode=OneWay}"
+                DistinguishedName="{Binding ViewModel.Computer.DistinguishedName, Mode=OneWay}" 
+                CN="{Binding ViewModel.Computer.CN, Mode=OneWay}" 
+                Changed="MemberOfControl_Changed" Error="MemberOfControl_Error" VerticalAlignment="Top" Margin="0,24,0,0" />
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="4" Grid.Column="0" Text="Service pack" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="4" Grid.Column="1" Text="{Binding ViewModel.Computer.OperatingSystemServicePack, Mode=OneWay}" />
         </Grid>
 
         <ui:Snackbar Grid.RowSpan="3" VerticalAlignment="Bottom" x:Name="snackbar" Appearance="Danger" Title="Error" Icon="ErrorCircle12" Message="Error" Timeout="5000" />
diff --git a/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml.cs b/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml.cs
index b29e96c..4571348 100644
--- a/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml.cs
+++ b/src/Sysadmin/Views/Pages/Computers/ComputerPage.xaml.cs
@@ -1,6 +1,9 @@
-using System.Windows;
+using SysAdmin.Services;
+using System.IO;
+using System.Windows;
 using System.Windows.Controls;
 using Wpf.Ui.Common.Interfaces;
+using Wpf.Ui.Mvvm.Contracts;
 
 namespace Sysadmin.Views.Pages
 {
@@ -9,15 +12,22 @@ namespace Sysadmin.Views.Pages
     /// </summary>
     public partial class ComputerPage : INavigableView<ViewModels.ComputerViewModel>
     {
+
+        private ISettingsService settings;
+        private INavigationService navigationService;
+
         public ViewModels.ComputerViewModel ViewModel
         {
             get;
         }
 
-        public ComputerPage(ViewModels.ComputerViewModel viewModel)
+        public ComputerPage(ViewModels.ComputerViewModel viewModel, ISettingsService settings, INavigationService navigationService)
         {
             ViewModel = viewModel;
 
+            this.settings = settings;
+            this.navigationService = navigationService;
+
             InitializeComponent();
 
             ViewModel.PropertyChanged += ViewModel_PropertyChanged;
@@ -36,6 +46,12 @@ private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.Pro
                 snackbar.Message = ViewModel.SuccessMessage;
                 snackbarOk.Show();
             }
+
+            if (e.PropertyName == "Computer")
+            {
+                memberOf.MemberOf = ViewModel.Computer.MemberOf;
+                memberOf.PrimaryGroupId = ViewModel.Computer.PrimaryGroupId;
+            }
         }
 
         private void DeleteMenuItem_Click(object sender, RoutedEventArgs e)
@@ -59,5 +75,41 @@ private void ShutdownMenuItem_Click(object sender, RoutedEventArgs e)
                 ViewModel.ShutdownCommand.Execute(ViewModel);
         }
 
+        private void vnc_Click(object sender, RoutedEventArgs e)
+        {
+            string path = settings.VNCPath;
+            string args = ViewModel.Computer.DnsHostName + ":" + settings.VNCPort.ToString();
+
+            if (File.Exists(path))
+            {
+                System.Diagnostics.Process.Start(path, args);   //NOSONAR
+            }
+            else
+            {
+                var result = MessageBox.Show("The VNС viewer is not installed or is located in a different location. Fix the path?", "Remote desktop", MessageBoxButton.YesNo);
+                if (result == MessageBoxResult.Yes)
+                {
+                    navigationService.Navigate(typeof(SettingsPage));
+                }
+            }
+        }
+
+        private void rdp_Click(object sender, RoutedEventArgs e)
+        {
+            string args = "/v:" + ViewModel.Computer.DnsHostName;
+            System.Diagnostics.Process.Start("mstsc", args);   //NOSONAR
+        }
+
+        private async void MemberOfControl_Changed()    //NOSONAR
+        {
+            await ViewModel.Get();
+        }
+
+        private void MemberOfControl_Error(string ErrorMessage)     //NOSONAR
+        {
+            snackbar.Message = ErrorMessage;
+            snackbar.Show();
+        }
+
     }
-}
+}
\ No newline at end of file
diff --git a/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml b/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml
index d8e23f3..2397721 100644
--- a/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml
+++ b/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml
@@ -101,6 +101,7 @@
                 </Grid.ColumnDefinitions>
 
                 <controls:MemberOfControl
+                    x:Name="memberOf"
                     Grid.Column="0"
                     MemberOf="{Binding ViewModel.Group.MemberOf, Mode=OneWay}"
                     PrimaryGroupId="{Binding ViewModel.Group.PrimaryGroupId, Mode=OneWay}"
@@ -109,6 +110,7 @@
                     Changed="MemberOfControl_Changed" Error="MemberOfControl_Error" VerticalAlignment="Top"/>
 
                 <controls:MembersControl
+                    x:Name="members"
                     Grid.Column="2"
                     Members="{Binding ViewModel.Group.Members, Mode=OneWay}"
                     CN="{Binding ViewModel.Group.CN, Mode=OneWay}" 
diff --git a/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml.cs b/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml.cs
index 09960cc..4cc618a 100644
--- a/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml.cs
+++ b/src/Sysadmin/Views/Pages/Groups/GroupPage.xaml.cs
@@ -20,6 +20,19 @@ public GroupPage(ViewModels.GroupViewModel viewModel)
             ViewModel = viewModel;
 
             InitializeComponent();
+
+            ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+        }
+
+        private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "Group")
+            {
+                memberOf.MemberOf = ViewModel.Group.MemberOf;
+                memberOf.PrimaryGroupId = ViewModel.Group.PrimaryGroupId;
+
+                members.Members = ViewModel.Group.Members;
+            }
         }
 
         private void DeleteMenuItem_Click(object sender, RoutedEventArgs e)
@@ -29,17 +42,17 @@ private void DeleteMenuItem_Click(object sender, RoutedEventArgs e)
                 ViewModel.DeleteCommand.Execute(ViewModel);
         }
 
-        private async void MembersControl_Changed()
+        private async void MembersControl_Changed() //NOSONAR
         {
             await ViewModel.Get();
         }
 
-        private async void MemberOfControl_Changed()
+        private async void MemberOfControl_Changed() //NOSONAR
         {
             await ViewModel.Get();
         }
 
-        private void MemberOfControl_Error(string ErrorMessage)
+        private void MemberOfControl_Error(string ErrorMessage) //NOSONAR
         {
             snackbar.Message = ErrorMessage;
             snackbar.Show();
diff --git a/src/Sysadmin/Views/Pages/SettingsPage.xaml b/src/Sysadmin/Views/Pages/SettingsPage.xaml
index c15570c..6f2289e 100644
--- a/src/Sysadmin/Views/Pages/SettingsPage.xaml
+++ b/src/Sysadmin/Views/Pages/SettingsPage.xaml
@@ -100,7 +100,28 @@
                         </StackPanel>
                     </ui:Card>
 
-                    <ui:Card Margin="0,24,0,0">
+                <ui:Card Margin="0,24,0,0">
+                    <StackPanel>
+                        <TextBlock
+                            FontSize="20"
+                            FontWeight="Medium"
+                            Text="Remote desktop" />
+
+                        <TextBlock Text="Path to VNC viewer" Margin="0,10,0,10" />
+                        <ui:TextBox x:Name="txtVNVPath" Margin="4" TextChanged="txtVNVPath_TextChanged" />
+
+                        <TextBlock Text="VNC port" Margin="0,10,0,10" />
+                        <ui:NumberBox 
+                            x:Name="numVNVPort" 
+                            HorizontalAlignment="Left" 
+                            InputScope="Number" 
+                            SpinButtonPlacementMode="Hidden" 
+                            Text="5000"
+                            ValueChanged="numVNVPort_ValueChanged" />
+                    </StackPanel>
+                </ui:Card>
+
+                <ui:Card Margin="0,24,0,0">
                         <StackPanel>
                             <TextBlock
             FontSize="20"
diff --git a/src/Sysadmin/Views/Pages/SettingsPage.xaml.cs b/src/Sysadmin/Views/Pages/SettingsPage.xaml.cs
index cb07aad..ca44931 100644
--- a/src/Sysadmin/Views/Pages/SettingsPage.xaml.cs
+++ b/src/Sysadmin/Views/Pages/SettingsPage.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using SysAdmin.Services;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows.Controls;
 using Wpf.Ui.Common.Interfaces;
 
@@ -19,11 +20,11 @@ public ViewModels.SettingsViewModel ViewModel
             get;
         }
 
-        public SettingsPage(ViewModels.SettingsViewModel viewModel, IServiceProvider serviceProvider)
+        public SettingsPage(ViewModels.SettingsViewModel viewModel, IServiceProvider serviceProvider, ISettingsService settings)
         {
             ViewModel = viewModel;
 
-            settings = serviceProvider.GetService<ISettingsService>();
+            this.settings = settings;
 
             InitializeComponent();
 
@@ -156,6 +157,19 @@ private void Patterns()
             }
 
             txtDefaultPassword.Text = settings.UserDefaultPassword;
+
+            txtVNVPath.Text = settings.VNCPath;
+            numVNVPort.Value = settings.VNCPort;
+        }
+
+        private void txtVNVPath_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            settings.VNCPath = txtVNVPath.Text;
+        }
+
+        private void numVNVPort_ValueChanged(object sender, System.Windows.RoutedEventArgs e)
+        {
+            settings.VNCPort = (int)numVNVPort.Value;
         }
 
     }
diff --git a/src/Sysadmin/Views/Pages/Users/UserPage.xaml b/src/Sysadmin/Views/Pages/Users/UserPage.xaml
index 5f49ef7..41ecc52 100644
--- a/src/Sysadmin/Views/Pages/Users/UserPage.xaml
+++ b/src/Sysadmin/Views/Pages/Users/UserPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Sysadmin.Views.Pages"
+    xmlns:controls="clr-namespace:Sysadmin.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:converters="clr-namespace:Sysadmin.Converters"
     xmlns:models="clr-namespace:Sysadmin.Models"
@@ -100,56 +101,74 @@
             </Menu>
         </Grid>
 
-        <Grid 
-            VerticalAlignment="Top"
-            Grid.Row="1" 
-            Margin="24">
+        <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <Image Grid.Row="0" Grid.ColumnSpan="2" Source="{Binding ViewModel.User.JpegPhoto, Mode=OneWay, Converter={StaticResource PhotoToSourceConverter}}" x:Name="personPicture" MaxWidth="200" MaxHeight="200" HorizontalAlignment="Left" Margin="0,0,0,8" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="1" Grid.Column="0" Text="Display name" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="1" Grid.Column="1" Text="{Binding ViewModel.User.DisplayName, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="2" Grid.Column="0" Text="Company" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="2" Grid.Column="1" Text="{Binding ViewModel.User.Company, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="3" Grid.Column="0" Text="Title" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="3" Grid.Column="1" Text="{Binding ViewModel.User.Title, Mode=OneWay}" />
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="4" Grid.Column="0" Text="Email" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="4" Grid.Column="1" Text="{Binding ViewModel.User.EmailAddress, Mode=OneWay}" />
+            <Grid 
+                Grid.Column="0"
+                VerticalAlignment="Top"            
+                Margin="24">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <controls:PersonPictureControl x:Name="personPicture" Grid.Row="0" Grid.ColumnSpan="2" Width="100" Height="100" HorizontalAlignment="Left" Margin="0,0,0,8" DisplayName="{Binding ViewModel.User.DisplayName}" ProfilePicture="{Binding ViewModel.User.JpegPhoto, Mode=OneWay, Converter={StaticResource PhotoToSourceConverter}}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="1" Grid.Column="0" Text="Display name" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="1" Grid.Column="1" Text="{Binding ViewModel.User.DisplayName, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="2" Grid.Column="0" Text="Company" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="2" Grid.Column="1" Text="{Binding ViewModel.User.Company, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="3" Grid.Column="0" Text="Title" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="3" Grid.Column="1" Text="{Binding ViewModel.User.Title, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="4" Grid.Column="0" Text="Email" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="4" Grid.Column="1" Text="{Binding ViewModel.User.EmailAddress, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="5" Grid.Column="0" Text="Mobile phone" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="5" Grid.Column="1" Text="{Binding ViewModel.User.MobilePhone, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="6" Grid.Column="0" Text="Office phone" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="6" Grid.Column="1" Text="{Binding ViewModel.User.OfficePhone, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="7" Grid.Column="0" Text="Home phone" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="7" Grid.Column="1" Text="{Binding ViewModel.User.HomePhone, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="8" Grid.Column="0" Text="Last logon" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="8" Grid.Column="1" Text="{Binding ViewModel.User.LastLogon, Mode=OneWay}" />
+
+                <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="9" Grid.Column="0" Text="Last password set" />
+                <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="9" Grid.Column="1" Text="{Binding ViewModel.User.PasswordLastSet, Mode=OneWay}" />
+            </Grid>
+
+            <controls:MemberOfControl
+                Grid.Column="1"
+                x:Name="memberOf"
+                MemberOf="{Binding ViewModel.User.MemberOf, Mode=OneWay}"
+                PrimaryGroupId="{Binding ViewModel.User.PrimaryGroupId, Mode=OneWay}"
+                DistinguishedName="{Binding ViewModel.User.DistinguishedName, Mode=OneWay}" 
+                CN="{Binding ViewModel.User.CN, Mode=OneWay}" 
+                Changed="MemberOfControl_Changed" Error="MemberOfControl_Error" VerticalAlignment="Top" Margin="0,24,0,0"/>
 
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="5" Grid.Column="0" Text="Mobile phone" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="5" Grid.Column="1" Text="{Binding ViewModel.User.MobilePhone, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="6" Grid.Column="0" Text="Office phone" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="6" Grid.Column="1" Text="{Binding ViewModel.User.OfficePhone, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="7" Grid.Column="0" Text="Home phone" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="7" Grid.Column="1" Text="{Binding ViewModel.User.HomePhone, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="8" Grid.Column="0" Text="Last logon" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="8" Grid.Column="1" Text="{Binding ViewModel.User.LastLogon, Mode=OneWay}" />
-
-            <TextBlock Style="{StaticResource TableDetailNameStyle}"  Grid.Row="9" Grid.Column="0" Text="Last password set" />
-            <TextBlock Style="{StaticResource TableDetailValueStyle}" Grid.Row="9" Grid.Column="1" Text="{Binding ViewModel.User.PasswordLastSet, Mode=OneWay}" />
         </Grid>
-        
+
+        <ui:Snackbar Grid.RowSpan="3" VerticalAlignment="Bottom" x:Name="snackbar" Appearance="Danger" Title="Error" Icon="ErrorCircle12" Message="Error" Timeout="5000" />
     </Grid>
 </ui:UiPage>
diff --git a/src/Sysadmin/Views/Pages/Users/UserPage.xaml.cs b/src/Sysadmin/Views/Pages/Users/UserPage.xaml.cs
index 7673da7..f02a9ec 100644
--- a/src/Sysadmin/Views/Pages/Users/UserPage.xaml.cs
+++ b/src/Sysadmin/Views/Pages/Users/UserPage.xaml.cs
@@ -7,6 +7,7 @@
 using Wpf.Ui.Common.Interfaces;
 using Microsoft.Win32;
 using System.IO;
+using Wpf.Ui.Controls;
 
 namespace Sysadmin.Views.Pages
 {
@@ -25,11 +26,29 @@ public UserPage(ViewModels.UserViewModel viewModel)
             ViewModel = viewModel;
 
             InitializeComponent();
+
+            ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+        }
+
+        private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "User")
+            {
+                memberOf.MemberOf = ViewModel.User.MemberOf;
+                memberOf.PrimaryGroupId = ViewModel.User.PrimaryGroupId;
+
+                if(string.IsNullOrEmpty(ViewModel.User.DisplayName))
+                    personPicture.DisplayName = ViewModel.User.CN;
+                else
+                    personPicture.DisplayName = ViewModel.User.DisplayName;
+
+                personPicture.JpegPhoto = ViewModel.User.JpegPhoto;
+            }
         }
 
         private void DeleteMenuItem_Click(object sender, RoutedEventArgs e)
         {
-            var result = MessageBox.Show("Are you sure you want to delete this user?", "Delete", MessageBoxButton.YesNo);
+            var result = System.Windows.MessageBox.Show("Are you sure you want to delete this user?", "Delete", MessageBoxButton.YesNo);
             if (result == MessageBoxResult.Yes)
                 ViewModel.DeleteCommand.Execute(ViewModel);
         }
@@ -44,33 +63,24 @@ private async void PhotoMenuItem_Click(object sender, RoutedEventArgs e)
                 if (openFileDialog.ShowDialog() == true)
                 {
                     await ViewModel.UpdatePhoto(ViewModel.User.DistinguishedName, File.ReadAllBytes(openFileDialog.FileName));
-                    ShowPhoto();
+                    personPicture.JpegPhoto = ViewModel.User.JpegPhoto;
                 }
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message, "Error");
+                System.Windows.MessageBox.Show(ex.Message, "Error");
             }
         }
 
-        private void ShowPhoto()
+        private async void MemberOfControl_Changed() //NOSONAR
         {
-            if (ViewModel.User.JpegPhoto != null && ViewModel.User.JpegPhoto.Length > 0)
-            {
-                var image = new BitmapImage();
-                using (var mem = new MemoryStream(ViewModel.User.JpegPhoto))
-                {
-                    mem.Position = 0;
-                    image.BeginInit();
-                    image.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
-                    image.CacheOption = BitmapCacheOption.OnLoad;
-                    image.UriSource = null;
-                    image.StreamSource = mem;
-                    image.EndInit();
-                }
-                image.Freeze();
-                personPicture.Source = image;
-            }
+            await ViewModel.Get();
+        }
+
+        private void MemberOfControl_Error(string ErrorMessage)
+        {
+            snackbar.Message = ErrorMessage;
+            snackbar.Show();
         }
 
     }
diff --git a/src/autoupdater.xml b/src/autoupdater.xml
index 6697b78..c229b9a 100644
--- a/src/autoupdater.xml
+++ b/src/autoupdater.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-	<version>10.2.0.0</version>
-	<url>https://github.com/sysadminanywhere/sysadmin/releases/download/v10.2/SysadminSetup.msi</url>
+	<version>10.3.0.0</version>
+	<url>https://github.com/sysadminanywhere/sysadmin/releases/download/v10.3/SysadminSetup.msi</url>
 	<mandatory>true</mandatory>
 </item>
\ No newline at end of file