diff --git a/wpf_ax_utility/MainWindow.xaml b/wpf_ax_utility/MainWindow.xaml
index 41269cf..2a042ac 100644
--- a/wpf_ax_utility/MainWindow.xaml
+++ b/wpf_ax_utility/MainWindow.xaml
@@ -28,7 +28,16 @@
 
     <Grid>
         <Border BorderBrush="#0082C4" BorderThickness="1.5" CornerRadius="10" Background="White">
-            <StackPanel>
+
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
                 <DockPanel>
                     <Border Height="25" Width="25" CornerRadius="5" Margin="2,0,0,0">
                         <Border.Background>
@@ -48,63 +57,78 @@
                         <TextBlock Text="x" Margin="0,-5,0,0"/>
                     </Button>
                 </DockPanel>
-                <GroupBox Margin="15,5,15,10"
-                          VerticalAlignment="Center"
+
+                <GroupBox Margin="10,2,10,10"
+                          VerticalAlignment="Stretch"
                           BorderBrush="LightGray"
                           BorderThickness="1"
-                          Header="Ambienti">
-                    <StackPanel Name="LayoutRoot"
-                                VerticalAlignment="Center"
-                                Margin="5,5,5,5">
+                          Header="Ambienti"
+                          Grid.Row="1">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition Height="60" />
+                        </Grid.RowDefinitions>
+
                         <Button Style="{StaticResource TabButton}"
                                 x:Name="LIVE"
                                 Click="ButtonClicked"
-                                Height="115" Width="325"
+                                Margin="5"
                                 Content="LIVE"
                                 FontSize="36"
-                                Background="LightGray"/>
-                        <DockPanel HorizontalAlignment="Center"
-                                   Margin="0,10,0,0">
-                            <Button Style="{StaticResource TabButton}"
-                                    x:Name="LIVE02"
-                                    Click="ButtonClicked"
-                                    Height="45" Width="75"
-                                    Margin="0,0,5,0"
-                                    Content="LIVE 02"
-                                    FontSize="16"
-                                    FontWeight="DemiBold"
-                                    Background="LightGray"/>
-                            <Button Style="{StaticResource TabButton}"
-                                    x:Name="DEV"
-                                    Click="ButtonClicked"
-                                    Height="45" Width="75"
-                                    Margin="0,0,5,0"
-                                    Content="DEV"
-                                    FontSize="16"
-                                    FontWeight="DemiBold"
-                                    Background="#00FF80"/>
-                            <Button Style="{StaticResource TabButton}"
-                                    x:Name="TEST"
-                                    Click="ButtonClicked"
-                                    Height="45" Width="75"
-                                    Margin="5,0,5,0"
-                                    Content="TEST"
-                                    FontSize="16"
-                                    FontWeight="DemiBold"
-                                    Background="#8080FF"/>
-                            <Button Style="{StaticResource TabButton}"
-                                    x:Name="STAGING"
-                                    Click="ButtonClicked"
-                                    Height="45" Width="75"
-                                    Margin="5,0,0,0"
-                                    Content="STAGING"
-                                    FontSize="16"
-                                    FontWeight="DemiBold"
-                                    Background="#FFFF00"/>
-                        </DockPanel>
-                    </StackPanel>
+                                Background="LightGray"
+                                Grid.ColumnSpan="4" />
+
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="LIVE02"
+                                Click="ButtonClicked"
+                                Margin="5"
+                                Content="LIVE 02"
+                                FontSize="16"
+                                FontWeight="DemiBold"
+                                Background="LightGray"
+                                Grid.Row="1"/>
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="DEV"
+                                Click="ButtonClicked"
+                                Margin="5"
+                                Content="DEV"
+                                FontSize="16"
+                                FontWeight="DemiBold"
+                                Background="#00FF80"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="TEST"
+                                Click="ButtonClicked"
+                                Margin="5"
+                                Content="TEST"
+                                FontSize="16"
+                                FontWeight="DemiBold"
+                                Background="#8080FF"
+                                Grid.Row="1"
+                                Grid.Column="2"/>
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="STAGING"
+                                Click="ButtonClicked"
+                                Margin="5"
+                                Content="STAGING"
+                                FontSize="16"
+                                FontWeight="DemiBold"
+                                Background="#FFFF00"
+                                Grid.Row="1"
+                                Grid.Column="3"/>
+
+                    </Grid>
                 </GroupBox>
-            </StackPanel>
+            </Grid>
+
         </Border>
     </Grid>
 </Window>
diff --git a/wpf_ax_utility/wpf_ax_utility.csproj b/wpf_ax_utility/wpf_ax_utility.csproj
index 7443582..754e202 100644
--- a/wpf_ax_utility/wpf_ax_utility.csproj
+++ b/wpf_ax_utility/wpf_ax_utility.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>axlogo.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,12 @@
     <None Remove="rdrect1197.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="axlogo.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.Graylog" Version="2.3.0" />