diff --git a/imagecatalog/AvaloniaApp.axaml b/imagecatalog/AvaloniaApp.axaml
index 97bd721..fc57b97 100644
--- a/imagecatalog/AvaloniaApp.axaml
+++ b/imagecatalog/AvaloniaApp.axaml
@@ -100,7 +100,7 @@
             <Setter Property="MinHeight" Value="16" />
         </Style>
 
-        <StyleInclude Source="avares://IconPacks.Avalonia/Icons.axaml" />
+        <StyleInclude Source="avares://IconPacks.Avalonia/Icons.axaml"/>
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>
diff --git a/imagecatalog/AvaloniaMainWindow.axaml b/imagecatalog/AvaloniaMainWindow.axaml
index ba21b00..c01f37f 100644
--- a/imagecatalog/AvaloniaMainWindow.axaml
+++ b/imagecatalog/AvaloniaMainWindow.axaml
@@ -5,6 +5,7 @@
     xmlns:views="clr-namespace:ImageCatalog_2.AvaloniaViews"
     xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
     x:Class="ImageCatalog_2.AvaloniaMainWindow"
+    x:CompileBindings="False"
     mc:Ignorable="d"
     Title="Image Catalog - Avalonia" Height="540" Width="800">
 
@@ -106,7 +107,7 @@
                     </Button>
                 </StackPanel>
                 <Border Grid.Row="1" BorderThickness="1" Padding="10" MaxWidth="280" MinWidth="0">
-                    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*" RowSpacing="8" MinWidth="0">
+                    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,*" MinWidth="0">
                         <StackPanel Grid.Row="0">
                             <Button HorizontalAlignment="Stretch" Margin="0,0,0,4" Command="{Binding LoadSettingsCommand}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
diff --git a/imagecatalog/AvaloniaMainWindow.axaml.cs b/imagecatalog/AvaloniaMainWindow.axaml.cs
index ec1c454..d996708 100644
--- a/imagecatalog/AvaloniaMainWindow.axaml.cs
+++ b/imagecatalog/AvaloniaMainWindow.axaml.cs
@@ -19,6 +19,11 @@ public partial class AvaloniaMainWindow : Window
     private bool _isDarkTheme;
     private bool _startupSettingsRestoreAttempted;
 
+    public AvaloniaMainWindow()
+        : this(Program.ServiceProvider.GetRequiredService<DataModel>())
+    {
+    }
+
     public AvaloniaMainWindow(DataModel model)
     {
         InitializeComponent();
diff --git a/imagecatalog/AvaloniaViews/AiTabView.axaml b/imagecatalog/AvaloniaViews/AiTabView.axaml
index 0a2d395..7c703df 100644
--- a/imagecatalog/AvaloniaViews/AiTabView.axaml
+++ b/imagecatalog/AvaloniaViews/AiTabView.axaml
@@ -2,7 +2,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:avaloniaDataGrid="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.DataGrid"
              xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
-             x:Class="ImageCatalog_2.AvaloniaViews.AiTabView">
+             x:Class="ImageCatalog_2.AvaloniaViews.AiTabView"
+             x:CompileBindings="False">
     <TabControl Margin="4">
         <TabItem Header="Esecuzione">
             <Grid RowDefinitions="Auto,*">
diff --git a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
index 858a4e7..55e74f1 100644
--- a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
+++ b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml
@@ -3,117 +3,139 @@
              xmlns:avaloniaDataGrid="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.DataGrid"
              xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
              xmlns:converters="clr-namespace:ImageCatalog_2.Converters"
-             x:Class="ImageCatalog_2.AvaloniaViews.FaceAiTabView">
+             x:Class="ImageCatalog_2.AvaloniaViews.FaceAiTabView"
+             x:CompileBindings="False">
     <UserControl.Resources>
         <converters:FilePathToBitmapConverter x:Key="FilePathToBitmapConverter" />
     </UserControl.Resources>
 
     <TabControl Margin="4">
         <TabItem Header="Encoder">
-            <ScrollViewer>
-                <StackPanel Margin="4" Spacing="6">
-                    <TextBlock Text="Face Recognition Encoder" FontWeight="Bold" />
-                    <TextBlock Text="Esegue il face encoder usando la cartella Destinazione corrente come --images e genera automaticamente file .pkl e log nella cartella di output scelta."
-                               TextWrapping="Wrap" Opacity="0.8" />
+            <TabControl Margin="0,4,0,0">
+                <TabItem Header="Esecuzione">
+                    <ScrollViewer>
+                        <StackPanel Margin="4" Spacing="6">
+                            <TextBlock Text="Face Recognition Encoder" FontWeight="Bold" />
+                            <TextBlock Text="Esegue il face encoder usando la cartella Destinazione corrente come --images e genera automaticamente file .pkl e log nella cartella di output scelta."
+                                       TextWrapping="Wrap" Opacity="0.8" />
 
-                    <TextBlock Text="Cartella Face Encoder" FontWeight="Bold" Margin="0,4,0,0" />
-                    <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
-                        <TextBlock Grid.Column="0" Text="Percorso:" VerticalAlignment="Center" />
-                        <TextBox Grid.Column="1" Name="FaceExecutablePathTextBox" Text="{Binding FaceExecutablePath, Mode=TwoWay}" Watermark="C:\tools\Face_Recognition_Windows" />
-                        <Button Grid.Column="2" Name="FaceSelectExecutableButton" Click="SelectFaceExecutable_Click" Width="104" Margin="6,0,0,0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                <iconPacks:PackIconMaterial Kind="FolderOutline" Width="14" Height="14" />
-                                <TextBlock Text="Scegli..." />
+                            <WrapPanel>
+                                <CheckBox Content="Ricorsivo (--recursive)" IsChecked="{Binding FaceRecursive, Mode=TwoWay}" Margin="0,0,12,6" />
+                                <CheckBox Content="Includi thumbnail (--include-tn)" IsChecked="{Binding FaceIncludeThumbnails, Mode=TwoWay}" Margin="0,0,12,6" />
+                                <CheckBox Content="Upsample (--upsample)" IsChecked="{Binding FaceUpsample, Mode=TwoWay}" Margin="0,0,12,6" />
+                                <CheckBox Content="Usa GPU"
+                                          IsChecked="{Binding UseFaceGpu, Mode=TwoWay}"
+                                          IsEnabled="{Binding FaceGpuOptionEnabled}"
+                                          Margin="0,0,12,6" />
+                            </WrapPanel>
+
+                            <Grid ColumnDefinitions="Auto,120,Auto,120,*" ColumnSpacing="6">
+                                <TextBlock Grid.Column="0" Text="Parallelismo:" VerticalAlignment="Center" />
+                                <ComboBox Grid.Column="1" ItemsSource="{Binding FaceParallelismOptions}" SelectedItem="{Binding FaceParallelism, Mode=TwoWay}" />
+                                <TextBlock Grid.Column="2" Text="Min size:" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="3" Text="{Binding FaceMinSize, Mode=TwoWay}" Watermark="35" />
+                                <TextBlock Grid.Column="4" Text="Usa --multicore in CPU e --multiprocess in GPU." VerticalAlignment="Center" TextWrapping="Wrap" Opacity="0.75" />
+                            </Grid>
+
+                            <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
+                                <TextBlock Grid.Column="0" Text="Sorgente:" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="1" Name="FaceDestinationPathTextBox" Text="{Binding DestinationPath, Mode=OneWay}" IsReadOnly="True" />
+                                <Button Grid.Column="3" Name="FaceOpenDestinationButton" Click="OpenFaceDestinationFolder_Click" Width="72" Margin="6,0,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                                        <TextBlock Text="Apri" />
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+
+                            <TextBlock Text="Output encodings" FontWeight="Bold" Margin="0,4,0,0" />
+                            <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
+                                <TextBlock Grid.Column="0" Text="Cartella out:" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="1" Name="FaceOutputFolderTextBox" Text="{Binding FaceOutputFolderPath, Mode=TwoWay}" Watermark="C:\output\face_encoder" />
+                                <Button Grid.Column="2" Name="FaceSelectOutputButton" Click="SelectFaceOutputFolder_Click" Width="104" Margin="6,0,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="FolderOutline" Width="14" Height="14" />
+                                        <TextBlock Text="Scegli..." />
+                                    </StackPanel>
+                                </Button>
+                                <Button Grid.Column="3" Name="FaceOpenOutputButton" Click="OpenFaceOutputFolder_Click" Width="72" Margin="6,0,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                                        <TextBlock Text="Apri" />
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+                            <TextBlock Text="I file vengono creati come face_encodings_yyyyMMdd_HHmmss_nomecartella.pkl e encoder_log_yyyyMMdd_HHmmss_nomecartella.txt."
+                                       TextWrapping="Wrap"
+                                       Opacity="0.75" />
+
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Spacing="8" Margin="0,6,0,0">
+                                <Button Name="FaceRunButton" Command="{Binding StartFaceEncoderCommand}" Width="176">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6" VerticalAlignment="Center">
+                                        <iconPacks:PackIconMaterial Kind="PlayCircle" Width="16" Height="16" Foreground="#2E7D32" />
+                                        <ProgressBar Width="18"
+                                                     Height="18"
+                                                     IsIndeterminate="True"
+                                                     IsVisible="{Binding IsFaceEncoderRunning}"
+                                                     ShowProgressText="False"
+                                                     VerticalAlignment="Center" />
+                                        <TextBlock Text="Esegui Face Encoder" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                                <Button Command="{Binding StopFaceEncoderCommand}" Width="120">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="Cancel" Width="16" Height="16" Foreground="#C62828" />
+                                        <TextBlock Text="Stop" />
+                                    </StackPanel>
+                                </Button>
+                                <TextBlock VerticalAlignment="Center" Text="{Binding FaceStatusMessage}" TextWrapping="Wrap" />
                             </StackPanel>
-                        </Button>
-                        <Button Grid.Column="3" Name="FaceOpenExecutableButton" Click="OpenFaceExecutableFolder_Click" Width="72" Margin="6,0,0,0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
-                                <TextBlock Text="Apri" />
-                            </StackPanel>
-                        </Button>
-                    </Grid>
 
-                    <StackPanel Orientation="Horizontal" Spacing="12">
-                        <CheckBox Content="Ricorsivo (--recursive)" IsChecked="{Binding FaceRecursive, Mode=TwoWay}" />
-                        <CheckBox Content="Includi thumbnail (--include-tn)" IsChecked="{Binding FaceIncludeThumbnails, Mode=TwoWay}" />
-                        <CheckBox Content="Upsample (--upsample)" IsChecked="{Binding FaceUpsample, Mode=TwoWay}" />
-                        <CheckBox Content="Usa GPU"
-                                  IsChecked="{Binding UseFaceGpu, Mode=TwoWay}"
-                                  IsEnabled="{Binding FaceGpuOptionEnabled}" />
-                    </StackPanel>
-                    <TextBlock Text="Seleziona la cartella base di Face Recognition Windows: l'app sceglie automaticamente face_encoder_cpu.exe o face_encoder_gpu.exe in base al checkbox GPU."
-                               TextWrapping="Wrap"
-                               Opacity="0.75" />
+                            <TextBlock Text="Output comando" FontWeight="Bold" Margin="0,6,0,0" />
+                            <TextBox Name="FaceOutputTextBox"
+                                     Text="{Binding FaceCommandOutput}"
+                                     IsReadOnly="True"
+                                     AcceptsReturn="True"
+                                     TextWrapping="Wrap"
+                                     FontFamily="Cascadia Mono, Consolas, monospace"
+                                     Height="220"
+                                     ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                     ScrollViewer.HorizontalScrollBarVisibility="Auto" />
+                        </StackPanel>
+                    </ScrollViewer>
+                </TabItem>
 
-                    <Grid ColumnDefinitions="Auto,120,Auto,120,*" ColumnSpacing="6">
-                        <TextBlock Grid.Column="0" Text="Parallelismo:" VerticalAlignment="Center" />
-                        <ComboBox Grid.Column="1" ItemsSource="{Binding FaceParallelismOptions}" SelectedItem="{Binding FaceParallelism, Mode=TwoWay}" />
-                        <TextBlock Grid.Column="2" Text="Min size:" VerticalAlignment="Center" />
-                        <TextBox Grid.Column="3" Text="{Binding FaceMinSize, Mode=TwoWay}" Watermark="35" />
-                        <TextBlock Grid.Column="4" Text="Usa --multicore in CPU e --multiprocess in GPU." VerticalAlignment="Center" Opacity="0.75" />
-                    </Grid>
+                <TabItem Header="Impostazioni">
+                    <ScrollViewer>
+                        <StackPanel Margin="4" Spacing="8">
+                            <TextBlock Text="Cartella Face Encoder" FontWeight="Bold" />
+                            <TextBlock Text="Seleziona la cartella base di face recognition"
+                                       TextWrapping="Wrap"
+                                       Opacity="0.8" />
+                            <TextBlock Text="L'app sceglie automaticamente face_encoder_cpu.exe o face_encoder_gpu.exe in base al checkbox GPU."
+                                       TextWrapping="Wrap"
+                                       Opacity="0.75" />
 
-                    <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
-                        <TextBlock Grid.Column="0" Text="Sorgente:" VerticalAlignment="Center" />
-                        <TextBox Grid.Column="1" Name="FaceDestinationPathTextBox" Text="{Binding DestinationPath, Mode=OneWay}" IsReadOnly="True" />
-                        <Button Grid.Column="3" Name="FaceOpenDestinationButton" Click="OpenFaceDestinationFolder_Click" Width="72" Margin="6,0,0,0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
-                                <TextBlock Text="Apri" />
-                            </StackPanel>
-                        </Button>
-                    </Grid>
-
-                    <TextBlock Text="Output encodings" FontWeight="Bold" Margin="0,4,0,0" />
-                    <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
-                        <TextBlock Grid.Column="0" Text="Cartella out:" VerticalAlignment="Center" />
-                        <TextBox Grid.Column="1" Name="FaceOutputFolderTextBox" Text="{Binding FaceOutputFolderPath, Mode=TwoWay}" Watermark="C:\output\face_encoder" />
-                        <Button Grid.Column="2" Name="FaceSelectOutputButton" Click="SelectFaceOutputFolder_Click" Width="104" Margin="6,0,0,0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                <iconPacks:PackIconMaterial Kind="FolderOutline" Width="14" Height="14" />
-                                <TextBlock Text="Scegli..." />
-                            </StackPanel>
-                        </Button>
-                        <Button Grid.Column="3" Name="FaceOpenOutputButton" Click="OpenFaceOutputFolder_Click" Width="72" Margin="6,0,0,0">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
-                                <TextBlock Text="Apri" />
-                            </StackPanel>
-                        </Button>
-                    </Grid>
-                    <TextBlock Text="I file vengono creati come face_encodings_yyyyMMdd_HHmmss_nomecartella.pkl e encoder_log_yyyyMMdd_HHmmss_nomecartella.txt."
-                               TextWrapping="Wrap"
-                               Opacity="0.75" />
-
-                    <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,6,0,0">
-                        <Button Name="FaceRunButton" Command="{Binding StartFaceEncoderCommand}">
-                            <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
-                                <ProgressBar Width="18"
-                                             Height="18"
-                                             IsIndeterminate="True"
-                                             IsVisible="{Binding IsFaceEncoderRunning}"
-                                             ShowProgressText="False"
-                                             VerticalAlignment="Center" />
-                                <TextBlock Text="Esegui Face Encoder" VerticalAlignment="Center" />
-                            </StackPanel>
-                        </Button>
-                        <Button Content="Stop" Command="{Binding StopFaceEncoderCommand}" />
-                        <TextBlock VerticalAlignment="Center" Text="{Binding FaceStatusMessage}" />
-                    </StackPanel>
-
-                    <TextBlock Text="Output comando" FontWeight="Bold" Margin="0,6,0,0" />
-                    <TextBox Name="FaceOutputTextBox"
-                             Text="{Binding FaceCommandOutput}"
-                             IsReadOnly="True"
-                             AcceptsReturn="True"
-                             TextWrapping="Wrap"
-                             FontFamily="Cascadia Mono, Consolas, monospace"
-                             Height="220"
-                             ScrollViewer.VerticalScrollBarVisibility="Auto"
-                             ScrollViewer.HorizontalScrollBarVisibility="Auto" />
-                </StackPanel>
-            </ScrollViewer>
+                            <Grid ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="6">
+                                <TextBlock Grid.Column="0" Text="Percorso:" VerticalAlignment="Center" />
+                                <TextBox Grid.Column="1" Name="FaceExecutablePathTextBox" Text="{Binding FaceExecutablePath, Mode=TwoWay}" Watermark="C:\tools\Face_Recognition_Windows" />
+                                <Button Grid.Column="2" Name="FaceSelectExecutableButton" Click="SelectFaceExecutable_Click" Width="104" Margin="6,0,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="FolderOutline" Width="14" Height="14" />
+                                        <TextBlock Text="Scegli..." />
+                                    </StackPanel>
+                                </Button>
+                                <Button Grid.Column="3" Name="FaceOpenExecutableButton" Click="OpenFaceExecutableFolder_Click" Width="72" Margin="6,0,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                        <iconPacks:PackIconMaterial Kind="Folder" Width="14" Height="14" />
+                                        <TextBlock Text="Apri" />
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+                        </StackPanel>
+                    </ScrollViewer>
+                </TabItem>
+            </TabControl>
         </TabItem>
 
         <TabItem Header="Matcher Test">
@@ -240,9 +262,10 @@
                         <TextBlock Grid.Column="2" Text="Range utile: 0.35 - 0.75. Più bassa = match più restrittivo, più alta = più permissivo." VerticalAlignment="Center" TextWrapping="Wrap" Opacity="0.75" />
                     </Grid>
 
-                    <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,6,0,0">
-                        <Button Command="{Binding StartFaceMatcherCommand}">
-                            <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Spacing="8" Margin="0,6,0,0">
+                        <Button Command="{Binding StartFaceMatcherCommand}" Width="176">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6" VerticalAlignment="Center">
+                                <iconPacks:PackIconMaterial Kind="PlayCircle" Width="16" Height="16" Foreground="#2E7D32" />
                                 <ProgressBar Width="18"
                                              Height="18"
                                              IsIndeterminate="True"
@@ -252,7 +275,12 @@
                                 <TextBlock Text="Avvia Face Matcher" VerticalAlignment="Center" />
                             </StackPanel>
                         </Button>
-                        <Button Content="Stop" Command="{Binding StopFaceMatcherCommand}" />
+                        <Button Command="{Binding StopFaceMatcherCommand}" Width="120">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                                <iconPacks:PackIconMaterial Kind="Cancel" Width="16" Height="16" Foreground="#C62828" />
+                                <TextBlock Text="Stop" />
+                            </StackPanel>
+                        </Button>
                         <TextBlock VerticalAlignment="Center" Text="{Binding FaceMatcherStatusMessage}" TextWrapping="Wrap" />
                     </StackPanel>
 
diff --git a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml.cs b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml.cs
index e4edbcc..e8b1c95 100644
--- a/imagecatalog/AvaloniaViews/FaceAiTabView.axaml.cs
+++ b/imagecatalog/AvaloniaViews/FaceAiTabView.axaml.cs
@@ -331,8 +331,7 @@ public partial class FaceAiTabView : Avalonia.Controls.UserControl
         var contentGrid = new Grid
         {
             Margin = new Avalonia.Thickness(0, 12, 0, 12),
-            RowDefinitions = new RowDefinitions("Auto,*,Auto"),
-            RowSpacing = 12
+            RowDefinitions = new RowDefinitions("Auto,*,Auto")
         };
         Grid.SetRow(contentGrid, 1);
 
@@ -371,7 +370,8 @@ public partial class FaceAiTabView : Avalonia.Controls.UserControl
         var toolbar = new StackPanel
         {
             Orientation = Orientation.Horizontal,
-            Spacing = 8
+            Spacing = 8,
+            Margin = new Avalonia.Thickness(0, 0, 0, 12)
         };
 
         var zoomOutButton = new Button { Content = "Zoom -", MinWidth = 80, IsEnabled = imageControl is not null };
@@ -427,7 +427,8 @@ public partial class FaceAiTabView : Avalonia.Controls.UserControl
             AcceptsReturn = true,
             TextWrapping = TextWrapping.Wrap,
             FontFamily = new FontFamily("Cascadia Mono, Consolas, monospace"),
-            MinHeight = 180
+            MinHeight = 180,
+            Margin = new Avalonia.Thickness(0, 12, 0, 0)
         };
         Grid.SetRow(debugBox, 2);
         contentGrid.Children.Add(debugBox);
diff --git a/imagecatalog/AvaloniaViews/RaceUploadTabView.axaml b/imagecatalog/AvaloniaViews/RaceUploadTabView.axaml
index cc3b507..1c9a6a8 100644
--- a/imagecatalog/AvaloniaViews/RaceUploadTabView.axaml
+++ b/imagecatalog/AvaloniaViews/RaceUploadTabView.axaml
@@ -7,7 +7,7 @@
             <TextBlock Text="Flusso: login admin, creazione gara, creazione punti foto, upload file processati da cartella destinazione locale, indicizzazione punti foto."
                        TextWrapping="Wrap" Opacity="0.8" />
 
-            <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto" ColumnSpacing="6" RowSpacing="6">
+            <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Row="0" Grid.Column="0" Text="Login:" VerticalAlignment="Center" />
                 <TextBox Grid.Row="0" Grid.Column="1" Name="ApiLoginTextBox" Text="{Binding ApiLogin, Mode=TwoWay}" Watermark="admin user" />
 
@@ -16,7 +16,7 @@
             </Grid>
 
             <TextBlock Text="Dati gara" FontWeight="Bold" Margin="0,4,0,0" />
-            <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto,Auto" ColumnSpacing="6" RowSpacing="6">
+            <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto,Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Row="0" Grid.Column="0" Text="Descrizione:" VerticalAlignment="Center" />
                 <TextBox Grid.Row="0" Grid.Column="1" Name="ApiRaceDescriptionTextBox" Text="{Binding ApiRaceDescription, Mode=TwoWay}" Watermark="Nome gara" />
 
@@ -49,7 +49,7 @@
                 </ComboBox>
             </Grid>
 
-            <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto" ColumnSpacing="6" RowSpacing="6">
+            <Grid ColumnDefinitions="Auto,*,Auto,*" RowDefinitions="Auto,Auto" ColumnSpacing="6">
                 <TextBlock Grid.Row="0" Grid.Column="0" Text="Evento Omaggio:" VerticalAlignment="Center" />
                 <ComboBox Grid.Row="0" Grid.Column="1" Name="ApiFreeEventComboBox" SelectedIndex="{Binding ApiFreeEventIndex, Mode=TwoWay}">
                     <ComboBoxItem Content="0 - No" />
diff --git a/imagecatalog/ImageCatalog 2.csproj b/imagecatalog/ImageCatalog 2.csproj
index 7446b3a..11eda12 100644
--- a/imagecatalog/ImageCatalog 2.csproj	
+++ b/imagecatalog/ImageCatalog 2.csproj	
@@ -3,6 +3,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+    <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
     <!-- Default assembly name for regular builds -->
     <AssemblyName>ImageCatalog</AssemblyName>
     <LangVersion>default</LangVersion>
@@ -46,12 +47,16 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <AvaloniaXaml Remove="AvaloniaApp.axaml" />
     <AvaloniaXaml Remove="Sorgenti\**" />
     <Compile Remove="Sorgenti\**" />
     <EmbeddedResource Remove="Sorgenti\**" />
     <None Remove="Sorgenti\**" />
     <Page Remove="Sorgenti\**" />
   </ItemGroup>
+  <ItemGroup>
+    <AvaloniaResource Include="AvaloniaApp.axaml" />
+  </ItemGroup>
   <ItemGroup>
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -71,10 +76,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.8" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.8" />
     <PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="all" />
-    <PackageReference Include="Avalonia" Version="12.0.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="12.0.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.3" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
+    <PackageReference Include="Avalonia" Version="11.3.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.13" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.13" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
     <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/imagecatalog/Models/SettingsDto.cs b/imagecatalog/Models/SettingsDto.cs
index 00c1783..fd68763 100644
--- a/imagecatalog/Models/SettingsDto.cs
+++ b/imagecatalog/Models/SettingsDto.cs
@@ -314,6 +314,10 @@ namespace ImageCatalog_2.Models
         [XmlElement("AI_FaceUpsample")]
         public bool FaceUpsample { get; set; } = true;
 
+        [JsonPropertyName("UseFaceGpu")]
+        [XmlElement("AI_UsaGpuFace")]
+        public bool UseFaceGpu { get; set; }
+
         [JsonPropertyName("FaceMatcherExecutablePath")]
         [XmlElement("AI_FaceMatcherExecutablePath")]
         public string FaceMatcherExecutablePath { get; set; } = string.Empty;