diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/MainWindow.xaml.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/MainWindow.xaml.cs
index 6bcccf7..e94c515 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/MainWindow.xaml.cs
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using WD7UVN_SzTGUI_2023242.Client.WPF.Windows;
 
 namespace WD7UVN_SzTGUI_2023242.Client.WPF
 {
@@ -20,17 +21,20 @@ namespace WD7UVN_SzTGUI_2023242.Client.WPF
 
         private void ExpandAllCustomers(object sender, RoutedEventArgs e)
         {
-
+            Window window = new GetAllCustomers();
+            window.Show();
         }
 
         private void ExpandAllEmployees(object sender, RoutedEventArgs e)
         {
-
+            Window window = new GetAllEmployees();
+            window.Show();
         }
 
         private void ExpandAllMaintainerTeams(object sender, RoutedEventArgs e)
         {
-
+            Window window = new GetAllMaintainerTeams();
+            window.Show();
         }
     }
 }
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllCustomersViewModel.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllCustomersViewModel.cs
new file mode 100644
index 0000000..b3f6872
--- /dev/null
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllCustomersViewModel.cs
@@ -0,0 +1,50 @@
+using WD7UVN_HFT_2023241.Models;
+using System.ComponentModel;
+using System.Windows;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+
+namespace WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels
+{
+    public class GetAllCustomersViewModel : ObservableRecipient
+    {
+        public RestCollection<Customer> Customers { get; set; }
+
+        private Customer selectedCustomer;
+
+        public Customer SelectedCustomer
+        {
+            get { return selectedCustomer; }
+            set { SetProperty(ref selectedCustomer, value); (UpdateCustomerCommand as RelayCommand).NotifyCanExecuteChanged(); }
+        }
+
+        public ICommand UpdateCustomerCommand { get; set; }
+
+        public static bool IsInDesignMode
+        {
+            get
+            {
+                var prop = DesignerProperties.IsInDesignModeProperty;
+                return (bool)DependencyPropertyDescriptor.FromProperty(prop, typeof(FrameworkElement)).Metadata.DefaultValue;
+            }
+        }
+
+        public GetAllCustomersViewModel()
+        {
+            if (!IsInDesignMode)
+            {
+                Customers = new RestCollection<Customer>("http://localhost:5000/", "api/Customer", "hub");
+
+                UpdateCustomerCommand = new RelayCommand(() =>
+                {
+                    Customers.Update(SelectedCustomer);
+                },
+                () =>
+                {
+                    return SelectedCustomer != null;
+                });
+            }
+        }
+    }
+}
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllEmployeesViewModel.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllEmployeesViewModel.cs
new file mode 100644
index 0000000..8361f9c
--- /dev/null
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllEmployeesViewModel.cs
@@ -0,0 +1,50 @@
+using WD7UVN_HFT_2023241.Models;
+using System.ComponentModel;
+using System.Windows;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+
+namespace WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels
+{
+    public class GetAllEmployeesViewModel : ObservableRecipient
+    {
+        public RestCollection<Employee> Employees { get; set; }
+
+        private Employee selectedEmployee;
+
+        public Employee SelectedEmployee
+        {
+            get { return selectedEmployee; }
+            set { SetProperty(ref selectedEmployee, value); (UpdateEmployeeCommand as RelayCommand).NotifyCanExecuteChanged(); }
+        }
+
+        public ICommand UpdateEmployeeCommand { get; set; }
+
+        public static bool IsInDesignMode
+        {
+            get
+            {
+                var prop = DesignerProperties.IsInDesignModeProperty;
+                return (bool)DependencyPropertyDescriptor.FromProperty(prop, typeof(FrameworkElement)).Metadata.DefaultValue;
+            }
+        }
+
+        public GetAllEmployeesViewModel()
+        {
+            if (!IsInDesignMode)
+            {
+                Employees = new RestCollection<Employee>("http://localhost:5000/", "api/Employee", "hub");
+
+                UpdateEmployeeCommand = new RelayCommand(() =>
+                {
+                    Employees.Update(SelectedEmployee);
+                },
+                () =>
+                {
+                    return SelectedEmployee != null;
+                });
+            }
+        }
+    }
+}
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllMaintainerTeamsViewModel.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllMaintainerTeamsViewModel.cs
new file mode 100644
index 0000000..f0fd541
--- /dev/null
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/ViewModels/GetAllMaintainerTeamsViewModel.cs
@@ -0,0 +1,50 @@
+using WD7UVN_HFT_2023241.Models;
+using System.ComponentModel;
+using System.Windows;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+
+namespace WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels
+{
+    public class GetAllMaintainerTeamsViewModel : ObservableRecipient
+    {
+        public RestCollection<MaintainerTeam> MaintainerTeams { get; set; }
+
+        private MaintainerTeam selectedMaintainerTeam;
+
+        public MaintainerTeam SelectedMaintainerTeam
+        {
+            get { return selectedMaintainerTeam; }
+            set { SetProperty(ref selectedMaintainerTeam, value); (UpdateMaintainerTeamCommand as RelayCommand).NotifyCanExecuteChanged(); }
+        }
+
+        public ICommand UpdateMaintainerTeamCommand { get; set; }
+
+        public static bool IsInDesignMode
+        {
+            get
+            {
+                var prop = DesignerProperties.IsInDesignModeProperty;
+                return (bool)DependencyPropertyDescriptor.FromProperty(prop, typeof(FrameworkElement)).Metadata.DefaultValue;
+            }
+        }
+
+        public GetAllMaintainerTeamsViewModel()
+        {
+            if (!IsInDesignMode)
+            {
+                MaintainerTeams = new RestCollection<MaintainerTeam>("http://localhost:5000/", "api/MaintainerTeam", "hub");
+
+                UpdateMaintainerTeamCommand = new RelayCommand(() =>
+                {
+                    MaintainerTeams.Update(SelectedMaintainerTeam);
+                },
+                () =>
+                {
+                    return SelectedMaintainerTeam != null;
+                });
+            }
+        }
+    }
+}
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml
index dc572f4..e1466bc 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml
@@ -3,60 +3,74 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.Windows"
+        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels"
         mc:Ignorable="d"
         Title="Customers" Height="550" Width="350">
+
+    <Window.DataContext>
+        <local:GetAllCustomersViewModel/>
+    </Window.DataContext>
+    
     <Grid>
-        <ListBox ItemsSource="{Binding Services}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="9*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <ListBox ItemsSource="{Binding Customers}" Grid.Row="0" SelectedItem="{Binding SelectedCustomer}">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Margin" Value="0" />
+                </Style>
+            </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Border BorderBrush="Gray" BorderThickness="1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*" />
-                                <ColumnDefinition Width="8*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
+                    <Border BorderBrush="Black" BorderThickness="1" Margin="5">
+                        <StackPanel>
+                            <Grid>
+                                <Grid.Resources>
+                                    <Style TargetType="TextBox">
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+                                </Grid.Resources>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*" />
+                                    <ColumnDefinition Width="8*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
 
-                            <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
-                            <Label Grid.Row="0" Grid.Column="1" Content="{Binding ID}" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
+                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ID}" IsReadOnly="True" Background="LightGray" />
 
-                            <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
-                            <Label Grid.Row="1" Grid.Column="1" Content="{Binding NAME}" />
-                            
-                            <Label Grid.Row="2" Grid.Column="0" Content="Version:" />
-                            <Label Grid.Row="2" Grid.Column="1" Content="{Binding VERSION}" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
+                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding NAME}" />
 
-                            <Label Grid.Row="3" Grid.Column="0" Content="Account:" />
-                            <Label Grid.Row="3" Grid.Column="1" Content="{Binding ACCOUNT}" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Email:" />
+                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding EMAIL}" />
 
-                            <Label Grid.Row="4" Grid.Column="0" Content="Domain:" />
-                            <Label Grid.Row="4" Grid.Column="1" Content="{Binding SERVICE_DOMAIN}" />
+                                <Label Grid.Row="3" Grid.Column="0" Content="Phone:" />
+                                <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding PHONE}" />
 
-                            <Label Grid.Row="5" Grid.Column="0" Content="IP address:" />
-                            <Label Grid.Row="5" Grid.Column="1" Content="{Binding IP}" />
-
-                            <Label Grid.Row="6" Grid.Column="0" Content="Port:" />
-                            <Label Grid.Row="6" Grid.Column="1" Content="{Binding PORT}" />
-
-                            <Label Grid.Row="7" Grid.Column="0" Content="Notes:" />
-                            <Label Grid.Row="7" Grid.Column="1" Content="{Binding NOTES}" />
-
-                            <Label Grid.Row="8" Grid.Column="0" Content="Maintainer Team ID:" />
-                            <Label Grid.Row="8" Grid.Column="1" Content="{Binding MAINTAINER_ID}" />
-                        </Grid>
+                                <Label Grid.Row="4" Grid.Column="0" Content="Service:" />
+                                <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding SERVICE_ID}" />
+                            </Grid>
+                        </StackPanel>
                     </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
+
+        <UniformGrid Rows="2" Grid.Row="1">
+            <Button Content="Edit selected" Command="{Binding UpdateCustomerCommand}"/>
+            <Button Content="Create new" Click="CreateNewCustomer" />
+        </UniformGrid>
     </Grid>
 </Window>
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml.cs
index b274b8d..3562103 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml.cs
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllCustomers.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
 {
@@ -23,5 +11,11 @@ namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
         {
             InitializeComponent();
         }
+
+        private void CreateNewCustomer(object sender, RoutedEventArgs e)
+        {
+            Window window = new CreateNewCustomer();
+            window.Show();
+        }
     }
 }
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml
index 48ef878..f0bebbe 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml
@@ -3,60 +3,78 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.Windows"
+        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels"
         mc:Ignorable="d"
         Title="Employees" Height="550" Width="350">
+
+    <Window.DataContext>
+        <local:GetAllEmployeesViewModel/>
+    </Window.DataContext>
+    
     <Grid>
-        <ListBox ItemsSource="{Binding Services}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="9*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <ListBox ItemsSource="{Binding Employees}" Grid.Row="0" SelectedItem="{Binding SelectedEmployee}">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Margin" Value="0" />
+                </Style>
+            </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Border BorderBrush="Gray" BorderThickness="1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*" />
-                                <ColumnDefinition Width="8*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
+                    <Border BorderBrush="Black" BorderThickness="1" Margin="5">
+                        <StackPanel>
+                            <Grid>
+                                <Grid.Resources>
+                                    <Style TargetType="TextBox">
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+                                </Grid.Resources>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*" />
+                                    <ColumnDefinition Width="8*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
 
-                            <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
-                            <Label Grid.Row="0" Grid.Column="1" Content="{Binding ID}" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
+                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ID}" IsReadOnly="True" Background="LightGray" />
 
-                            <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
-                            <Label Grid.Row="1" Grid.Column="1" Content="{Binding NAME}" />
-                            
-                            <Label Grid.Row="2" Grid.Column="0" Content="Version:" />
-                            <Label Grid.Row="2" Grid.Column="1" Content="{Binding VERSION}" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
+                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding NAME}" />
 
-                            <Label Grid.Row="3" Grid.Column="0" Content="Account:" />
-                            <Label Grid.Row="3" Grid.Column="1" Content="{Binding ACCOUNT}" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Email:" />
+                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding EMAIL}" />
 
-                            <Label Grid.Row="4" Grid.Column="0" Content="Domain:" />
-                            <Label Grid.Row="4" Grid.Column="1" Content="{Binding SERVICE_DOMAIN}" />
+                                <Label Grid.Row="3" Grid.Column="0" Content="Phone:" />
+                                <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding PHONE}" />
 
-                            <Label Grid.Row="5" Grid.Column="0" Content="IP address:" />
-                            <Label Grid.Row="5" Grid.Column="1" Content="{Binding IP}" />
+                                <Label Grid.Row="4" Grid.Column="0" Content="Team ID:" />
+                                <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding MAINTAINER_ID}" />
 
-                            <Label Grid.Row="6" Grid.Column="0" Content="Port:" />
-                            <Label Grid.Row="6" Grid.Column="1" Content="{Binding PORT}" />
-
-                            <Label Grid.Row="7" Grid.Column="0" Content="Notes:" />
-                            <Label Grid.Row="7" Grid.Column="1" Content="{Binding NOTES}" />
-
-                            <Label Grid.Row="8" Grid.Column="0" Content="Maintainer Team ID:" />
-                            <Label Grid.Row="8" Grid.Column="1" Content="{Binding MAINTAINER_ID}" />
-                        </Grid>
+                                <Label Grid.Row="5" Grid.Column="0" Content="Manager ID:" />
+                                <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding MANAGER_ID}" />
+                            </Grid>
+                        </StackPanel>
                     </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
+
+        <UniformGrid Rows="2" Grid.Row="1">
+            <Button Content="Edit selected" Command="{Binding UpdateEmployeeCommand}"/>
+            <Button Content="Create new" Click="CreateNewEmployee" />
+        </UniformGrid>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml.cs
index 4dc7ed8..8a81cbe 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml.cs
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllEmployees.xaml.cs
@@ -23,5 +23,11 @@ namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
         {
             InitializeComponent();
         }
+
+        private void CreateNewEmployee(object sender, RoutedEventArgs e)
+        {
+            Window window = new CreateNewEmployee();
+            window.Show();
+        }
     }
 }
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml
index 6f7a350..914dcfb 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml
@@ -3,60 +3,70 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.Windows"
+        xmlns:local="clr-namespace:WD7UVN_SzTGUI_2023242.Client.WPF.ViewModels"
         mc:Ignorable="d"
         Title="Maintainer teams" Height="550" Width="350">
+
+    <Window.DataContext>
+        <local:GetAllMaintainerTeamsViewModel/>
+    </Window.DataContext>
+    
     <Grid>
-        <ListBox ItemsSource="{Binding Services}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="9*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <ListBox ItemsSource="{Binding MaintainerTeams}" Grid.Row="0" SelectedItem="{Binding SelectedMaintainerTeam}">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Margin" Value="0" />
+                </Style>
+            </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Border BorderBrush="Gray" BorderThickness="1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*" />
-                                <ColumnDefinition Width="8*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
+                    <Border BorderBrush="Black" BorderThickness="1" Margin="5">
+                        <StackPanel>
+                            <Grid>
+                                <Grid.Resources>
+                                    <Style TargetType="TextBox">
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+                                </Grid.Resources>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="2*" />
+                                    <ColumnDefinition Width="8*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
 
-                            <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
-                            <Label Grid.Row="0" Grid.Column="1" Content="{Binding ID}" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
+                                <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ID}" IsReadOnly="True" Background="LightGray" />
 
-                            <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
-                            <Label Grid.Row="1" Grid.Column="1" Content="{Binding NAME}" />
-                            
-                            <Label Grid.Row="2" Grid.Column="0" Content="Version:" />
-                            <Label Grid.Row="2" Grid.Column="1" Content="{Binding VERSION}" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="Name:" />
+                                <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding NAME}" />
 
-                            <Label Grid.Row="3" Grid.Column="0" Content="Account:" />
-                            <Label Grid.Row="3" Grid.Column="1" Content="{Binding ACCOUNT}" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Email:" />
+                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding EMAIL}" />
 
-                            <Label Grid.Row="4" Grid.Column="0" Content="Domain:" />
-                            <Label Grid.Row="4" Grid.Column="1" Content="{Binding SERVICE_DOMAIN}" />
-
-                            <Label Grid.Row="5" Grid.Column="0" Content="IP address:" />
-                            <Label Grid.Row="5" Grid.Column="1" Content="{Binding IP}" />
-
-                            <Label Grid.Row="6" Grid.Column="0" Content="Port:" />
-                            <Label Grid.Row="6" Grid.Column="1" Content="{Binding PORT}" />
-
-                            <Label Grid.Row="7" Grid.Column="0" Content="Notes:" />
-                            <Label Grid.Row="7" Grid.Column="1" Content="{Binding NOTES}" />
-
-                            <Label Grid.Row="8" Grid.Column="0" Content="Maintainer Team ID:" />
-                            <Label Grid.Row="8" Grid.Column="1" Content="{Binding MAINTAINER_ID}" />
-                        </Grid>
+                                <Label Grid.Row="3" Grid.Column="0" Content="Team leader:" />
+                                <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding LEADER_ID}" />
+                            </Grid>
+                        </StackPanel>
                     </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
+
+        <UniformGrid Rows="2" Grid.Row="1">
+            <Button Content="Edit selected" Command="{Binding UpdateMaintainerTeamCommand}"/>
+            <Button Content="Create new" Click="CreateNewMaintainerTeam" />
+        </UniformGrid>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml.cs
index 52de9a7..2e5ddbd 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml.cs
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllMaintainerTeams.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
 {
@@ -23,5 +11,11 @@ namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
         {
             InitializeComponent();
         }
+
+        private void CreateNewMaintainerTeam(object sender, RoutedEventArgs e)
+        {
+            Window window = new CreateNewMaintainerTeam();
+            window.Show();
+        }
     }
 }
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
index 8f04839..36e743f 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="WD7UVN_SzTGUI_2023242.Client.WPF.GetAllServices"
+<Window x:Class="WD7UVN_SzTGUI_2023242.Client.WPF.Windows.GetAllServices"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml.cs b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml.cs
index 7dea1a3..f7f98fd 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml.cs
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml.cs
@@ -1,8 +1,6 @@
 using System.Windows;
-using WD7UVN_HFT_2023241.Models;
-using WD7UVN_SzTGUI_2023242.Client.WPF.Windows;
 
-namespace WD7UVN_SzTGUI_2023242.Client.WPF
+namespace WD7UVN_SzTGUI_2023242.Client.WPF.Windows
 {
     /// <summary>
     /// Interaction logic for GetAllServices.xaml