diff --git a/wpf_ax_utility/MainWindow.xaml b/wpf_ax_utility/MainWindow.xaml
index 2a042ac..aeb832c 100644
--- a/wpf_ax_utility/MainWindow.xaml
+++ b/wpf_ax_utility/MainWindow.xaml
@@ -39,7 +39,7 @@
                 </Grid.RowDefinitions>
 
                 <DockPanel>
-                    <Border Height="25" Width="25" CornerRadius="5" Margin="2,0,0,0">
+                    <Border Height="25" Width="25" CornerRadius="5" Margin="4,3,0,0">
                         <Border.Background>
                             <ImageBrush Stretch="Fill" ImageSource="/axlogo.ico"/>
                         </Border.Background>
@@ -131,4 +131,5 @@
 
         </Border>
     </Grid>
+    
 </Window>
diff --git a/wpf_ax_utility/UserWindow.xaml b/wpf_ax_utility/UserWindow.xaml
index 555ae16..9871f8d 100644
--- a/wpf_ax_utility/UserWindow.xaml
+++ b/wpf_ax_utility/UserWindow.xaml
@@ -28,9 +28,18 @@
 
     <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 Height="25" Width="25" CornerRadius="5" Margin="4,3,0,0">
                         <Border.Background>
                             <ImageBrush Stretch="Fill" ImageSource="/axlogo.ico"/>
                         </Border.Background>
@@ -48,35 +57,40 @@
                         <TextBlock Text="x" Margin="0,-5,0,0"/>
                     </Button>
                 </DockPanel>
-                <GroupBox Margin="15,5,15,10"
-                          VerticalAlignment="Center"
-                          BorderBrush="LightGray"
-                          BorderThickness="1"
-                          Header="Ambienti">
-                    <StackPanel Name="LayoutRoot"
-                                VerticalAlignment="Center"
-                                Margin="5,5,5,5">
+
+                <GroupBox Margin="10,2,10,10"
+                            VerticalAlignment="Stretch"
+                            BorderBrush="LightGray"
+                            BorderThickness="1"
+                            Header="Ambienti"
+                            Grid.Row="1">
+
+                    <Grid>
+                        <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="STAGING"
-                                    Click="ButtonClicked"
-                                    Height="45" Width="325"
-                                    Content="STAGING"
-                                    FontSize="18"
-                                    FontWeight="DemiBold"
-                                    Background="#FFFF00"/>
-                        </DockPanel>
-                    </StackPanel>
+
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="STAGING"
+                                Click="ButtonClicked"
+                                Margin="5"
+                                Content="STAGING"
+                                FontSize="18"
+                                FontWeight="DemiBold"
+                                Background="#FFFF00"
+                                Grid.Row="2"/>
+                    </Grid>
                 </GroupBox>
-            </StackPanel>
+            </Grid>
         </Border>
     </Grid>
 </Window>