diff --git a/imagecatalog/MainWindow.xaml b/imagecatalog/MainWindow.xaml
index b423b4c..c50e252 100644
--- a/imagecatalog/MainWindow.xaml
+++ b/imagecatalog/MainWindow.xaml
@@ -161,7 +161,6 @@
 
                         <TextBlock Text="Opzioni" FontWeight="Bold" Margin="0,12,0,0" />
                         <StackPanel Orientation="Vertical" Margin="0,6,0,0">
-                            <CheckBox Content="Crea miniature" IsChecked="{Binding CreateThumbnails}" />
                             <CheckBox Content="Forza JPEG" IsChecked="{Binding ForceJpeg}" />
                             <CheckBox Content="Aggiorna sottodirectory" IsChecked="{Binding UpdateSubdirectories}" />
                             <CheckBox Content="Crea sottocartelle" IsChecked="{Binding CreateSubfolders}" />
@@ -214,7 +213,7 @@
                         <TextBox Text="{Binding HorizontalText, Mode=TwoWay}" />
 
                         <TextBlock Text="Testo Verticale" FontWeight="Bold" Margin="0,8,0,0" />
-                        <TextBox Text="{Binding VerticalText, Mode=TwoWay}" />
+                        <TextBox Text="{Binding VerticalText, Mode=TwoWay}" AcceptsReturn="True" TextWrapping="Wrap" MinLines="4" VerticalScrollBarVisibility="Auto" />
 
                         <TextBlock Text="Font" FontWeight="Bold" Margin="0,8,0,0" />
                         <StackPanel Orientation="Horizontal">
@@ -227,12 +226,8 @@
                         <StackPanel Orientation="Horizontal">
                             <TextBox Text="{Binding TextColorRGB}" Width="120" />
                             <Button Content="Seleziona colore" Command="{Binding SelectColorCommand}" Margin="8,0,0,0" />
-                            <Button Command="{Binding SelectTransparentColorCommand}" Margin="8,0,0,0">
-                                <StackPanel Orientation="Horizontal">
-                                    <iconPacks:PackIconMaterial Kind="PaletteOutline" Width="14" Height="14" Foreground="{StaticResource AccentBrush}" Margin="0,0,6,0" />
-                                    <TextBlock Text="Seleziona trasparente" />
-                                </StackPanel>
-                            </Button>
+                            <!-- MahApps color picker for direct color selection -->
+                            <controls:ColorPicker SelectedColor="{Binding TextColor}" Width="160" Margin="8,0,0,0" />
                         </StackPanel>
 
                         <TextBlock Text="Dimensioni verticale" FontWeight="Bold" Margin="0,8,0,0" />
@@ -248,6 +243,17 @@
                             <TextBlock Text="Margine testo:" VerticalAlignment="Center" Margin="12,0,0,0" />
                             <TextBox Text="{Binding TextMargin}" Width="60" Margin="8,0,0,0" />
                         </StackPanel>
+                        <!-- Tempo Gara section moved from Foto tab -->
+                        <TextBlock Text="Tempo Gara" FontWeight="Bold" Margin="0,12,0,0" />
+                        <StackPanel Orientation="Horizontal" Margin="0,6,0,0">
+                            <CheckBox Content="Aggiungi Orario" IsChecked="{Binding AddTime}" />
+                            <CheckBox Content="Aggiungi tempo gara" IsChecked="{Binding AddRaceTime}" Margin="12,0,0,0" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,6,0,0">
+                            <TextBlock Text="Partenza:" VerticalAlignment="Center" />
+                            <controls:DateTimePicker SelectedDateTime="{Binding RaceTime}" IsEnabled="{Binding AddRaceTime}" Margin="8,0,0,0" Width="200" />
+                            <TextBox Text="{Binding TimeLabel}" Width="220" Margin="12,0,0,0" />
+                        </StackPanel>
                     </StackPanel>
                 </ScrollViewer>
             </controls:MetroTabItem>
@@ -271,8 +277,6 @@
                         <StackPanel Orientation="Vertical" Margin="0,6,0,0">
                             <CheckBox Content="Mantieni dimensioni originali" IsChecked="{Binding KeepOriginalDimensions}" />
                             <CheckBox Content="Rotazione automatica" IsChecked="{Binding AutomaticRotation}" />
-                            <CheckBox Content="Aggiungi tempo" IsChecked="{Binding AddTime}" />
-                            <CheckBox Content="Aggiungi tempo gara" IsChecked="{Binding AddRaceTime}" />
                         </StackPanel>
 
                         <TextBlock Text="JPEG" FontWeight="Bold" Margin="0,8,0,0" />
@@ -296,6 +300,7 @@
                 <ScrollViewer>
                     <StackPanel Margin="8">
                         <TextBlock Text="Miniature" FontWeight="Bold" />
+                        <CheckBox Content="Crea miniature" IsChecked="{Binding CreateThumbnails}" Margin="0,6,0,0" />
                         <StackPanel Orientation="Horizontal" Margin="0,6,0,0">
                             <TextBlock Text="Prefisso:" VerticalAlignment="Center" />
                             <TextBox Text="{Binding ThumbnailPrefix}" Width="120" Margin="8,0,0,0" />
@@ -353,6 +358,12 @@
                             <TextBox Text="{Binding LogoMargin}" Width="80" Margin="8,0,0,0" />
                             <TextBlock Text="Trasparenza:" VerticalAlignment="Center" Margin="12,0,0,0" />
                             <TextBox Text="{Binding LogoTransparency}" Width="60" Margin="8,0,0,0" />
+                            <Button Command="{Binding SelectTransparentColorCommand}" Margin="8,0,0,0">
+                                <StackPanel Orientation="Horizontal">
+                                    <iconPacks:PackIconMaterial Kind="PaletteOutline" Width="14" Height="14" Foreground="{StaticResource AccentBrush}" Margin="0,0,6,0" />
+                                    <TextBlock Text="Seleziona trasparente" />
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
                             <TextBlock Text="Posizione:" VerticalAlignment="Center" />