diff --git a/EgtCalculator.xaml b/EgtCalculator.xaml
index 332f131..c0da564 100644
--- a/EgtCalculator.xaml
+++ b/EgtCalculator.xaml
@@ -2,32 +2,36 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:system="clr-namespace:System;assembly=mscorlib"
-   Height="320" Width="341.3" Background="Transparent" Focusable="False">
+   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+   mc:Ignorable="d"
+   d:DesignWidth="341.3" d:DesignHeight="320"
+   Background="Transparent" Focusable="False">
 
    <UserControl.Resources>
       <ResourceDictionary Source="EgtWPFLibDictionary.xaml"/>
    </UserControl.Resources>
 
-   <Grid Background="DarkGray">
+   <Grid x:Name="CalculatorGrid" Background="DarkGray">
       <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
+         <RowDefinition x:Name="HeaderRow" Height="1*"/>
          <RowDefinition Height="4*"/>
       </Grid.RowDefinitions>
 
-      <Grid Grid.Row="0">
+      <Grid x:Name="TitleGrid" Grid.Row="0">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.25*"/>
             <ColumnDefinition Width="4.5*"/>
             <ColumnDefinition Width="0.25*"/>
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
-            <RowDefinition Height="0.25*"/>
+            <RowDefinition x:Name="TitleRow" Height="0.25*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="0.25*"/>
          </Grid.RowDefinitions>
 
-         <TextBox Name="ValueTxBx" Grid.Column="1" Grid.Row="1" TextAlignment="Right"
-            FontSize="{DynamicResource EgtCalculator_FontSize}"/>
+         <TextBox x:Name="ValueTxBx" Grid.Column="1" Grid.Row="1" TextAlignment="Right"
+				FontSize="{DynamicResource EgtCalculator_FontSize}"/>
 
       </Grid>
 
@@ -46,45 +50,45 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <Button Name="SevenBtn" Grid.Column="0" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="7"/>
-         <Button Name="EightBtn" Grid.Column="1" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="8"/>
-         <Button Name="NineBtn" Grid.Column="2" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="9"/>
-         <Button Name="MinusBtn" Grid.Column="3" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="-"/>
-         <Button Name="BackspaceBtn" Grid.Column="4" Grid.Row="0">
+         <Button x:Name="SevenBtn" Grid.Column="0" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="7"/>
+         <Button x:Name="EightBtn" Grid.Column="1" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="8"/>
+         <Button x:Name="NineBtn" Grid.Column="2" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="9"/>
+         <Button x:Name="MinusBtn" Grid.Column="3" Grid.Row="0" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="-"/>
+         <Button x:Name="BackspaceBtn" Grid.Column="4" Grid.Row="0">
             <Image Source="/Resources/EgtCalculator/DeleteArrow.png" Style="{DynamicResource ButtonIcon}"/>
          </Button>
-         <Button Name="FourBtn" Grid.Column="0" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="4"/>
-         <Button Name="FiveBtn" Grid.Column="1" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="5"/>
-         <Button Name="SixBtn" Grid.Column="2" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="6"/>
-         <Button Name="PlusBtn" Grid.Column="3" Grid.Row="1" Grid.RowSpan="2"
-            FontSize="{DynamicResource EgtCalculator_FontSize}" Content="+"/>
-         <Button Name="TimesBtn" Grid.Column="4" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="*"/>
-         <Button Name="OneBtn" Grid.Column="0" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="1"/>
-         <Button Name="TwoBtn" Grid.Column="1" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="2"/>
-         <Button Name="ThreeBtn" Grid.Column="2" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="3"/>
-         <Button Name="DividedBtn" Grid.Column="4" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="/"/>
-         <Button Name="ZeroBtn" Grid.Column="0" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="0"/>
-         <Button Name="DotBtn" Grid.Column="1" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="."/>
-         <Button Name="EvaluateBtn" Grid.Column="2" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
-            Content="="/>
-         <Button Name="VBtn" Grid.Column="3" Grid.Row="3" >
+         <Button x:Name="FourBtn" Grid.Column="0" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="4"/>
+         <Button x:Name="FiveBtn" Grid.Column="1" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="5"/>
+         <Button x:Name="SixBtn" Grid.Column="2" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="6"/>
+         <Button x:Name="PlusBtn" Grid.Column="3" Grid.Row="1" Grid.RowSpan="2"
+				FontSize="{DynamicResource EgtCalculator_FontSize}" Content="+"/>
+         <Button x:Name="TimesBtn" Grid.Column="4" Grid.Row="1" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="*"/>
+         <Button x:Name="OneBtn" Grid.Column="0" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="1"/>
+         <Button x:Name="TwoBtn" Grid.Column="1" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="2"/>
+         <Button x:Name="ThreeBtn" Grid.Column="2" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="3"/>
+         <Button x:Name="DividedBtn" Grid.Column="4" Grid.Row="2" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="/"/>
+         <Button x:Name="ZeroBtn" Grid.Column="0" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="0"/>
+         <Button x:Name="DotBtn" Grid.Column="1" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="."/>
+         <Button x:Name="EvaluateBtn" Grid.Column="2" Grid.Row="3" FontSize="{DynamicResource EgtCalculator_FontSize}"
+				Content="="/>
+         <Button x:Name="VBtn" Grid.Column="3" Grid.Row="3" >
             <Image Source="/Resources/V.png" Style="{DynamicResource ButtonIcon}"/>
          </Button>
-         <Button Name="XBtn" Grid.Column="4" Grid.Row="3" >
+         <Button x:Name="XBtn" Grid.Column="4" Grid.Row="3" >
             <Image Source="/Resources/X.png" Style="{DynamicResource ButtonIcon}"/>
          </Button>
 
diff --git a/EgtCalculatorWD.xaml b/EgtCalculatorWD.xaml
index c20e595..9749087 100644
--- a/EgtCalculatorWD.xaml
+++ b/EgtCalculatorWD.xaml
@@ -2,14 +2,14 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    Title="EgtCalculatorWD" Height="320" Width="341.3" ShowInTaskbar="False" ResizeMode="NoResize" WindowStyle="None"
-   AllowsTransparency="True" Initialized="Window_Initialized">
+   AllowsTransparency="True">
 
    <Window.Resources>
       <ResourceDictionary Source="EgtWPFLibDictionary.xaml" />
    </Window.Resources>
 
    <!-- Definizione della Calculator Window -->
-   <Grid Name="CalculatorWDGrid" Background="DarkGray">
+   <Grid Name="CalculatorWDGrid">
        
    </Grid>
 
diff --git a/EgtCalculatorWD.xaml.vb b/EgtCalculatorWD.xaml.vb
index 21eab45..9cee4cf 100644
--- a/EgtCalculatorWD.xaml.vb
+++ b/EgtCalculatorWD.xaml.vb
@@ -54,28 +54,26 @@ Public Class EgtCalculatorWD
 
    End Sub
 
-   Private Sub Window_Initialized(sender As Object, e As EventArgs)
+   Private Sub EgtCalculatorWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
 
       'Applico il FontFamily alla finestra
       Dim EgtFontFamilyConverter As New FontFamilyConverter
       Me.FontFamily = EgtFontFamilyConverter.ConvertFromString(InitializeEgtWPFLib.FontFamilyPath)
 
-      ' Verifico se è presente un titolo
-      If m_sTitle <> String.Empty Then
-         ' Ricreo nuova griglia
-         CalculatorWDGrid.Children.Clear()
-         Dim TitleRow As New RowDefinition
-         TitleRow.Height = New GridLength(0.5, GridUnitType.Star)
-         CalculatorWDGrid.RowDefinitions.Add(TitleRow)
-         Dim CalculatorRow As New RowDefinition
-         CalculatorRow.Height = New GridLength(5, GridUnitType.Star)
-         CalculatorWDGrid.RowDefinitions.Add(CalculatorRow)
-      End If
-
       ' Creo calcolatrice 
       m_Calculator = New EgtCalculator(m_Owner, m_dStartValue, m_Width, m_WidthType)
 
-      ' La posiziono nella finestra
+      ' Se è presente un titolo gli creo lo spazio nella calcolatrice
+      If m_sTitle <> String.Empty Then
+         'Dim HeaderRow2 As New RowDefinition
+         'HeaderRow2.Height = New GridLength(1.25, GridUnitType.Star)
+         m_Calculator.HeaderRow.Height = New GridLength(1.25, GridUnitType.Star)
+         'Dim TitleRow2 As New RowDefinition
+         'TitleRow2.Height = New GridLength(0.5, GridUnitType.Star)
+         m_Calculator.TitleRow.Height = New GridLength(0.5, GridUnitType.Star)
+      End If
+
+      ' Posiziono la calcolatrice nella griglia
       If m_sTitle <> String.Empty Then
          m_Calculator.SetValue(Grid.RowProperty, 1)
       End If
@@ -85,11 +83,12 @@ Public Class EgtCalculatorWD
       If m_sTitle <> String.Empty Then
          Dim TitleTxBl As New TextBlock
          TitleTxBl.Text = m_sTitle
-         CalculatorWDGrid.Children.Add(TitleTxBl)
          TitleTxBl.FontSize = m_Calculator.dFontSize
          TitleTxBl.Margin = New Thickness(5, 0, 0, 0)
          TitleTxBl.HorizontalAlignment = Windows.HorizontalAlignment.Left
          TitleTxBl.VerticalAlignment = Windows.VerticalAlignment.Center
+         TitleTxBl.SetValue(Grid.ColumnProperty, 1)
+         m_Calculator.TitleGrid.Children.Add(TitleTxBl)
       End If
       ' Rendo tasti V e X modali
       m_Calculator.VBtn.IsCancel = True
@@ -101,7 +100,8 @@ Public Class EgtCalculatorWD
 
       ' Se il titolo è presente aumento l'altezza della finestra
       If m_sTitle <> String.Empty Then
-         Me.Height += m_Calculator.Height / 5 * 0.5
+         m_Calculator.Height += m_Calculator.Height / 5 * 0.5
+         Me.Height = m_Calculator.Height
       End If
 
       Me.Top = m_Owner.Top + (m_Owner.Height / 2) - (Me.Height / 2)
@@ -112,6 +112,11 @@ Public Class EgtCalculatorWD
 
    End Sub
 
+   Private Sub EgtCalculatorWD_ContentRendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
+      m_Calculator.ValueTxBx.Focus()
+      m_Calculator.ValueTxBx.SelectAll()
+   End Sub
+
    Private Sub m_Calculator_EgtClosed(sender As Object, e As System.EventArgs) Handles m_Calculator.EgtClosed
       If IsNothing(m_Calculator.bConfirmResult) Then
          DialogResult = False