diff --git a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
index 36bbd3e..8f04839 100644
--- a/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
+++ b/WD7UVN_SzTGUI_2023242.Client.WPF/Windows/GetAll/GetAllServices.xaml
@@ -27,58 +27,66 @@
             </ListBox.ItemContainerStyle>
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <StackPanel>
-                        <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="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
 
-                            <Label Grid.Row="0" Grid.Column="0" Content="ID:" />
-                            <TextBox Grid.Row="0" Grid.Column="1" Text="{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:" />
-                            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding NAME}" />
-                            
-                            <Label Grid.Row="2" Grid.Column="0" Content="Version:" />
-                            <TextBox Grid.Row="2" Grid.Column="1" Text="{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:" />
-                            <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ACCOUNT}" />
+                                <Label Grid.Row="2" Grid.Column="0" Content="Version:" />
+                                <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding VERSION}" />
 
-                            <Label Grid.Row="4" Grid.Column="0" Content="Domain:" />
-                            <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding SERVICE_DOMAIN}" />
+                                <Label Grid.Row="3" Grid.Column="0" Content="Account:" />
+                                <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ACCOUNT}" />
 
-                            <Label Grid.Row="5" Grid.Column="0" Content="IP address:" />
-                            <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding IP}" />
+                                <Label Grid.Row="4" Grid.Column="0" Content="Domain:" />
+                                <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding SERVICE_DOMAIN}" />
 
-                            <Label Grid.Row="6" Grid.Column="0" Content="Port:" />
-                            <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding PORT}" />
+                                <Label Grid.Row="5" Grid.Column="0" Content="IP address:" />
+                                <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding IP}" />
 
-                            <Label Grid.Row="7" Grid.Column="0" Content="Notes:" />
-                            <TextBox Grid.Row="7" Grid.Column="1" Text="{Binding NOTES}" />
+                                <Label Grid.Row="6" Grid.Column="0" Content="Port:" />
+                                <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding PORT}" />
 
-                            <Label Grid.Row="8" Grid.Column="0" Content="Maintainer Team ID:" />
-                            <TextBox Grid.Row="8" Grid.Column="1" Text="{Binding MAINTAINER_ID}" />
-                        </Grid>
-                    </StackPanel>
+                                <Label Grid.Row="7" Grid.Column="0" Content="Team ID:" />
+                                <TextBox Grid.Row="7" Grid.Column="1" Text="{Binding MAINTAINER_ID}" />
+
+                                <Label Grid.Row="8" Grid.Column="0" Content="Notes:" />
+                                <TextBox Grid.Row="8" Grid.Column="1" Text="{Binding NOTES}" />
+                            </Grid>
+                        </StackPanel>
+                    </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
         <UniformGrid Rows="2" Grid.Row="1">
-            <Button Content="Create new" Click="CreateNewService" />
             <Button Content="Edit selected" Command="{Binding UpdateServiceCommand}"/>
+            <Button Content="Create new" Click="CreateNewService" />
         </UniformGrid>
     </Grid>
 </Window>