diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb
index 1cab8fb..60844cd 100644
--- a/AboutBoxWindow/AboutBoxView.xaml.vb
+++ b/AboutBoxWindow/AboutBoxView.xaml.vb
@@ -17,17 +17,18 @@ Public Class AboutBoxView
    End Sub
 
    Private Sub AboutBoxView_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      Me.Owner = Application.Current.MainWindow
-      Me.Owner = Owner
+      'Me.Owner = Application.Current.MainWindow
+      'Me.Owner = Owner
       Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
       Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      Me.Close()
+      Me.Visibility = Windows.Visibility.Hidden
    End Sub
 
    Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      Me.Owner = Application.Current.MainWindow
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
       VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
                                  "." & My.Application.Info.Version.Minor.ToString() &
diff --git a/AttachedBehaviours/AutomaticCloseExpander.vb b/AttachedBehaviours/AutomaticCloseExpander.vb
new file mode 100644
index 0000000..fc44883
--- /dev/null
+++ b/AttachedBehaviours/AutomaticCloseExpander.vb
@@ -0,0 +1,151 @@
+'----------------------------------------------------------------------------
+'  EgalTech 2016-2016
+'----------------------------------------------------------------------------
+' File : AutomaticCloseExpander.vb       Data : 8.9.16        Versione : 1
+' Content : AutomatiCloseExpander Behavior (see detailed description below)
+'
+' Created by : Emmanuele Sassi
+' Edited by : 
+'
+' Changes : 
+'
+'----------------------------------------------------------------------------
+'
+' Behavior description: permit to close other Expander when one is about to expand if they have to use more space than how many the StackPanel offers.
+' Control that can use this behavior: StackPanel
+' Internal structure of the control that can use it (example):
+'
+'  <StackPanel>
+'     <Expander Header="Expander"/>
+'     <Expander Header="Expander"/>
+'     <Button Height="30" Width="30"/>
+'     <Expander Header="Expander">
+'     </Expander>
+'     <Interactivity:Interaction.Behaviors>
+'        <local:AutomaticCloseExpander/>
+'     </Interactivity:Interaction.Behaviors>
+'  </StackPanel>
+'
+' IMPORTANT: The behavior have to be added at the end of the StackPanel to function correctly
+' Needed library: System.Windows.Interactivity 
+
+Imports System.Windows.Interactivity
+
+Public Class AutomaticCloseExpander
+   Inherits Behavior(Of StackPanel)
+
+   Private ExpanderList As New List(Of Expander)
+   Private OtherControlList As New List(Of FrameworkElement)
+
+   Protected Overrides Sub OnAttached()
+      MyBase.OnAttached()
+      For Each StackPanelChildren In Me.AssociatedObject.Children
+         If TypeOf StackPanelChildren Is Expander Then
+            Dim CurrExpander As Expander = DirectCast(StackPanelChildren, Expander)
+            ExpanderList.Add(CurrExpander)
+            AddHandler CurrExpander.Expanded, AddressOf Expander_Expanded
+         Else
+            Dim OtherControl As FrameworkElement = DirectCast(StackPanelChildren, FrameworkElement)
+            OtherControlList.Add(OtherControl)
+         End If
+      Next
+   End Sub
+
+   Private Sub Expander_Expanded(sender As Object, e As System.Windows.RoutedEventArgs)
+      Dim SelectedExpander As Expander = DirectCast(sender, Expander)
+      If Me.AssociatedObject.Orientation = Orientation.Vertical Then
+         VerticalVerifyDimension(SelectedExpander)
+      Else
+         HorizontalVerifyDimension(SelectedExpander)
+      End If
+   End Sub
+
+   Private Sub VerticalVerifyDimension(SelectedExpander As Expander)
+      Dim TotalDimension As Double = 0
+      'Aggiungo la dimensione di tutti gli Header
+      For Each Expander In ExpanderList
+         If Expander IsNot SelectedExpander Then
+            If Not Expander.IsExpanded Then
+               TotalDimension += Expander.ActualHeight
+            Else
+               Dim ExpanderContent As FrameworkElement = DirectCast(Expander.Content, FrameworkElement)
+               ExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+               TotalDimension += (Expander.ActualHeight - ExpanderContent.DesiredSize.Height)
+            End If
+         Else
+            TotalDimension += Expander.ActualHeight
+         End If
+      Next
+      ' Aggiungo la dimensione dei controlli fissi (non Expander)
+      For Each OtherControl In OtherControlList
+         TotalDimension += OtherControl.ActualHeight
+      Next
+      ' Aggiungo la dimensione del contenuto dell'expander selezionato
+      Dim SelectedContent As FrameworkElement = DirectCast(SelectedExpander.Content, FrameworkElement)
+      SelectedContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      TotalDimension += SelectedContent.DesiredSize.Height
+      ' Verifico per tutti gli expander (tranne quello selezionato) a partire dal primo se sono espansi e nel caso se la loro dimensione totale li fa stare nello spazio disponibile
+      Dim Index As Integer = 0
+      For Index = 0 To ExpanderList.Count - 1
+         If ExpanderList(Index) IsNot SelectedExpander Then
+            If ExpanderList(Index).IsExpanded Then
+               Dim ExpanderContent As FrameworkElement = DirectCast(ExpanderList(Index).Content, FrameworkElement)
+               TotalDimension += ExpanderContent.ActualHeight
+               If TotalDimension > Me.AssociatedObject.MaxHeight Then
+                  Exit For
+               End If
+            End If
+         End If
+      Next
+      For CancelIndex = Index To ExpanderList.Count - 1
+         If ExpanderList(CancelIndex) IsNot SelectedExpander Then
+            ExpanderList(CancelIndex).IsExpanded = False
+         End If
+      Next
+   End Sub
+
+   Private Sub HorizontalVerifyDimension(SelectedExpander As Expander)
+      Dim TotalDimension As Double = 0
+      'Aggiungo la dimensione di tutti gli Header
+      For Each Expander In ExpanderList
+         If Expander IsNot SelectedExpander Then
+            If Not Expander.IsExpanded Then
+               TotalDimension += Expander.ActualWidth
+            Else
+               Dim ExpanderContent As FrameworkElement = DirectCast(Expander.Content, FrameworkElement)
+               ExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+               TotalDimension += (Expander.ActualWidth - ExpanderContent.DesiredSize.Width)
+            End If
+         Else
+            TotalDimension += Expander.ActualWidth
+         End If
+      Next
+      ' Aggiungo la dimensione dei controlli fissi (non Expander)
+      For Each OtherControl In OtherControlList
+         TotalDimension += OtherControl.ActualWidth
+      Next
+      ' Aggiungo la dimensione del contenuto dell'expander selezionato
+      Dim SelectedContent As FrameworkElement = DirectCast(SelectedExpander.Content, FrameworkElement)
+      SelectedContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      TotalDimension += SelectedContent.DesiredSize.Width
+      ' Verifico per tutti gli expander (tranne quello selezionato) a partire dal primo se sono espansi e nel caso se la loro dimensione totale li fa stare nello spazio disponibile
+      Dim Index As Integer = 0
+      For Index = 0 To ExpanderList.Count - 1
+         If ExpanderList(Index) IsNot SelectedExpander Then
+            If ExpanderList(Index).IsExpanded Then
+               Dim ExpanderContent As FrameworkElement = DirectCast(ExpanderList(Index).Content, FrameworkElement)
+               TotalDimension += ExpanderContent.ActualWidth
+               If TotalDimension > Me.AssociatedObject.ActualWidth Then
+                  Exit For
+               End If
+            End If
+         End If
+      Next
+      For CancelIndex = Index To ExpanderList.Count - 1
+         If ExpanderList(CancelIndex) IsNot SelectedExpander Then
+            ExpanderList(CancelIndex).IsExpanded = False
+         End If
+      Next
+   End Sub
+
+End Class
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 501985e..3e495bd 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -117,6 +117,7 @@
     <Compile Include="AboutBoxWindow\AboutBoxView.xaml.vb">
       <DependentUpon>AboutBoxView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AttachedBehaviours\AutomaticCloseExpander.vb" />
     <Compile Include="AttachedBehaviours\InputBindingsManager.vb" />
     <Compile Include="AttachedBehaviours\ScrollIntoViewForListBox.vb" />
     <Compile Include="Base\TabViewModel.vb" />
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index 4cbd19a..7737ecb 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -48,8 +48,12 @@ Namespace EgtCAM5
       End Property
 
       Private m_AboutBox As Window
+      Private bFirstAboutBox As Boolean = True
       Public ReadOnly Property AboutBox As Window
          Get
+            If bFirstAboutBox Then
+               m_AboutBox = New AboutBoxView
+            End If
             Return New AboutBoxView
          End Get
       End Property
diff --git a/ProjectPage/DrawPanel/DrawPanelView.xaml b/ProjectPage/DrawPanel/DrawPanelView.xaml
index d767e2a..a14a7b0 100644
--- a/ProjectPage/DrawPanel/DrawPanelView.xaml
+++ b/ProjectPage/DrawPanel/DrawPanelView.xaml
@@ -1,16 +1,13 @@
 <UserControl x:Class="DrawPanelView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+   xmlns:EgtCAM5="clr-namespace:EgtCAM5">
 
-   <Grid Background="Transparent">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
+   <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Header="2D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="0" IsExpanded="{Binding Draw2DIsExpanded}">
-         <UniformGrid Columns="3">
+         <UniformGrid Columns="2">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding PointCommand}">
                <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
             </Button>
@@ -56,7 +53,7 @@
          </UniformGrid>
       </Expander>
       <Expander Name="Draw3D" Header="3D Draw" Style="{StaticResource DrawPanelExpander}" Grid.Row="1" IsExpanded="{Binding Draw3DIsExpanded}">
-         <UniformGrid Columns="3">
+         <UniformGrid Columns="2">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding PlaneCommand}">
                <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
             </Button>
@@ -85,7 +82,7 @@
          </UniformGrid>
       </Expander>
       <Expander Name="Modify" Header="Modify" Style="{StaticResource DrawPanelExpander}" Grid.Row="2" IsExpanded="{Binding ModifyIsExpanded}">
-         <UniformGrid Columns="3">
+         <UniformGrid Columns="2">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding DeleteCommand}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
@@ -129,7 +126,7 @@
          </UniformGrid>
       </Expander>
       <Expander Name="Transform" Header="Transform" Style="{StaticResource DrawPanelExpander}" Grid.Row="3" IsExpanded="{Binding TransformIsExpanded}">
-         <UniformGrid Columns="3">
+         <UniformGrid Columns="2">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}" Command="{Binding MoveCommand}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
             </Button>
@@ -157,5 +154,9 @@
 
          </UniformGrid>
       </Expander>
-   </Grid>
+      <Interactivity:Interaction.Behaviors>
+         <EgtCAM5:AutomaticCloseExpander/>
+      </Interactivity:Interaction.Behaviors>
+   </StackPanel>
+
 </UserControl>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index c78b61a..67c0437 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -3,11 +3,11 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:sys="clr-namespace:System;assembly=mscorlib"
    xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:local="clr-namespace:EgtCAM5"
+   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
    <UserControl.Resources>
-      <local:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
+      <EgtCAM5:OperationParamVisibilityConverter x:Key="OperationParamVisibilityConverter"/>
       <sys:Int32 x:Key="BaseParameters">0</sys:Int32>
       <sys:Int32 x:Key="GenericParameters">1</sys:Int32>
       <sys:Int32 x:Key="LeadInTypeParameters">2</sys:Int32>
@@ -25,9 +25,9 @@
 
    </UserControl.Resources>
 
-   <StackPanel>
+   <StackPanel Name="OperationExpanderViewStackPanel">
 
-      <Expander Header="Operations List" IsExpanded="{Binding ListIsExpanded}">
+      <Expander Header="Operations List" IsExpanded="{Binding ListIsExpanded}" Name="OperationsListExpander">
 
          <StackPanel>
 
@@ -39,7 +39,7 @@
             <ListBox IsSynchronizedWithCurrentItem="True" ItemsSource="{Binding OperationList}" SelectedItem="{Binding SelectedOperation}"
                      Height="200" x:Name="OperationList" IsEnabled="{Binding IsEnabledOperationList}">
                <Interactivity:Interaction.Behaviors>
-                  <local:ScrollIntoViewForListBox/>
+                  <EgtCAM5:ScrollIntoViewForListBox/>
                </Interactivity:Interaction.Behaviors>
                <ListBox.ItemTemplate>
                   <DataTemplate>
@@ -64,9 +64,10 @@
          </StackPanel>
       </Expander>
 
-      <Expander Header="Operation Parameters" IsExpanded="{Binding ParametersIsExpanded}">
-         <StackPanel>
-            <StackPanel Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
+      <Expander Header="Operation Parameters" IsExpanded="{Binding ParametersIsExpanded}" Name="OperationParametersExpander">
+         <StackPanel Name="OperationParametersStackPanel">
+            <StackPanel Name="OperationFirstParametersStackPanel"
+               Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
                                         Converter={StaticResource OperationParamVisibilityConverter},
                                         ConverterParameter={StaticResource BaseParameters}}">
                <UniformGrid Columns="2">
@@ -86,7 +87,7 @@
                             IsSynchronizedWithCurrentItem="True">
                   </ComboBox>
                </UniformGrid>
-            <Button Height="30" Content="Reload Machining" Command="{Binding ReloadMachiningCommand}" />
+               <Button Height="30" Content="Reload Machining" Command="{Binding ReloadMachiningCommand}" />
             </StackPanel>
             <Expander Header="Generic" Visibility="{Binding Path=SelectedItem.Type, ElementName=OperationList,
                                         Converter={StaticResource OperationParamVisibilityConverter},
@@ -287,6 +288,9 @@
                   </UniformGrid>
                </StackPanel>
             </Expander>
+            <Interactivity:Interaction.Behaviors>
+               <EgtCAM5:AutomaticCloseExpander/>
+            </Interactivity:Interaction.Behaviors>
          </StackPanel>
       </Expander>
 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
index 966d3cd..8921f1f 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
@@ -1,3 +1,102 @@
-Public Class OperationExpanderView
+Imports EgtWPFLib5
+Imports EgtWPFLib5.EgtFloating
+Public Class OperationExpanderView
+
+   Private EgtFloatingTray As EgtFloatingTray
+   Private OptionPanelView As UserControl
+   Private OptionPanelViewStackPanel As StackPanel
+   Private MachiningTreeContentPresenter As ContentPresenter
+   Private MachiningTreeUserControl As UserControl
+   Private MachiningTreeExpander As Expander
+   Private SimulationContentPresenter As ContentPresenter
+   Private SimulationUserControl As UserControl
+   Private SimulationExpanderStackPanel As StackPanel
+   Private SimulationExpander As Expander
+   Private GenerateButton As Button
+
+   Private m_bFirst As Boolean = True
+
+   Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+      If m_bFirst Then
+         EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
+         OptionPanelView = FindAncestor(Of UserControl)(Me)
+         OptionPanelViewStackPanel = DirectCast(OptionPanelView.Content, StackPanel)
+         MachiningTreeContentPresenter = DirectCast(OptionPanelViewStackPanel.Children(1), ContentPresenter)
+         MachiningTreeUserControl = DirectCast(MachiningTreeContentPresenter.Content, UserControl)
+         MachiningTreeExpander = DirectCast(MachiningTreeUserControl.Content, Expander)
+         SimulationContentPresenter = DirectCast(OptionPanelViewStackPanel.Children(2), ContentPresenter)
+         SimulationUserControl = DirectCast(SimulationContentPresenter.Content, UserControl)
+         SimulationExpanderStackPanel = DirectCast(SimulationUserControl.Content, StackPanel)
+         SimulationExpander = DirectCast(SimulationExpanderStackPanel.Children(0), Expander)
+         GenerateButton = DirectCast(SimulationExpanderStackPanel.Children(1), Button)
+         ' Gestisco l'evento SizeChanged della Tray 
+         AddHandler EgtFloatingTray.SizeChanged, AddressOf OperationExpanderTray_SizeChanged
+         m_bFirst = False
+      End If
+      CalculateOperationParametersStackPanelMaxHeight()
+   End Sub
+
+   Private Sub OperationExpanderTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
+      CalculateOperationParametersStackPanelMaxHeight()
+      For Each Expander In OperationParametersStackPanel.Children
+         If TypeOf Expander Is Expander Then
+            Dim CurrExpander As Expander = DirectCast(Expander, Expander)
+            CurrExpander.IsExpanded = False
+         End If
+      Next
+   End Sub
+
+   Private Sub CalculateOperationParametersStackPanelMaxHeight()
+      Dim OccupiedHeight As Double = 0
+      If Not MachiningTreeExpander.IsExpanded Then
+         OccupiedHeight += MachiningTreeExpander.ActualHeight
+      Else
+         Dim MachiningTreeExpanderContent As FrameworkElement = DirectCast(MachiningTreeExpander.Content, FrameworkElement)
+         MachiningTreeExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+         OccupiedHeight += (MachiningTreeExpander.ActualHeight - MachiningTreeExpanderContent.DesiredSize.Height)
+      End If
+      If Not SimulationExpander.IsExpanded Then
+         OccupiedHeight += SimulationExpander.ActualHeight
+      Else
+         Dim SimulationExpanderContent As FrameworkElement = DirectCast(SimulationExpander.Content, FrameworkElement)
+         SimulationExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+         OccupiedHeight += (SimulationExpander.ActualHeight - SimulationExpanderContent.DesiredSize.Height)
+      End If
+      OccupiedHeight += GenerateButton.ActualHeight
+      ' Aggiungo altezza OperationsList header Expander
+      If Not OperationsListExpander.IsExpanded Then
+         OccupiedHeight += OperationsListExpander.ActualHeight
+      Else
+         Dim OperationsListExpanderContent As FrameworkElement = DirectCast(OperationsListExpander.Content, FrameworkElement)
+         OperationsListExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+         OccupiedHeight += (OperationsListExpander.ActualHeight - OperationsListExpanderContent.DesiredSize.Height)
+      End If
+      If Not OperationParametersExpander.IsExpanded Then
+         OccupiedHeight += OperationParametersExpander.ActualHeight
+      Else
+         Dim OperationParametersExpanderContent As FrameworkElement = DirectCast(OperationParametersExpander.Content, FrameworkElement)
+         OperationParametersExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+         OccupiedHeight += (OperationParametersExpander.ActualHeight - OperationParametersExpanderContent.DesiredSize.Height)
+      End If
+      ' Aggiungo altezza contenuto OperationParameters che però è fuori dallo Stackpanel
+      OperationFirstParametersStackPanel.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
+      OccupiedHeight += OperationFirstParametersStackPanel.DesiredSize.Height
+      OperationParametersStackPanel.MaxHeight = OptionPanelViewStackPanel.MaxHeight - OccupiedHeight
+   End Sub
+
+   ' Funzione che permette di trovare il primo contenitore di tipo T di un elemento grafico dependencyObject 
+   Public Function FindAncestor(Of T As Class)(dependencyObject As DependencyObject) As T
+      Dim target As DependencyObject = dependencyObject
+      Do
+         target = LogicalTreeHelper.GetParent(target)
+      Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
+      If IsNothing(target) Then
+         target = dependencyObject
+         Do
+            target = VisualTreeHelper.GetParent(target)
+         Loop While target IsNot Nothing AndAlso Not (TypeOf target Is T)
+      End If
+      Return TryCast(target, T)
+   End Function
 
 End Class
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
index bdd4ae1..d7f9329 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
@@ -3,81 +3,86 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
 
-   <Expander Header="Simulation" IsExpanded="{Binding IsExpanded}">
-      <StackPanel >
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
+   <StackPanel>
+      <Expander Header="Simulation" IsExpanded="{Binding IsExpanded}">
+         <StackPanel >
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+                  <RowDefinition Height="0.5*"/>
+               </Grid.RowDefinitions>
 
-            <TextBlock Text="{Binding L1Name}" Grid.Column="0" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding L1Value}" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding L2Name}" Grid.Column="0" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding L2Value}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding L3Name}" Grid.Column="0" Grid.Row="2" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding L3Value}" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding R1Name}" Grid.Column="0" Grid.Row="3" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding R1Value}" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding R2Name}" Grid.Column="0" Grid.Row="4" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding R2Value}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding GCode}" Grid.Column="0" Grid.Row="5" FontSize="15" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" />
-            <EgtWPFLib5:EgtTextBox Text="{Binding FValue}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2"
-               Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
-            <TextBlock Text="{Binding TName}" Grid.Column="0" Grid.Row="6" FontSize="13" HorizontalAlignment="Center"
-                  VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
-            <TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="6"  FontSize="13" HorizontalAlignment="Right"
-                  VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,0" />
+               <TextBlock Text="{Binding L1Name}" Grid.Column="0" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding L1Value}" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding L2Name}" Grid.Column="0" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding L2Value}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding L3Name}" Grid.Column="0" Grid.Row="2" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding L3Value}" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding R1Name}" Grid.Column="0" Grid.Row="3" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding R1Value}" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding R2Name}" Grid.Column="0" Grid.Row="4" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding R2Value}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding GCode}" Grid.Column="0" Grid.Row="5" FontSize="15" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" />
+               <EgtWPFLib5:EgtTextBox Text="{Binding FValue}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2"
+                  Width="120" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
+               <TextBlock Text="{Binding TName}" Grid.Column="0" Grid.Row="6" FontSize="13" HorizontalAlignment="Center"
+                     VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
+               <TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="6"  FontSize="13" HorizontalAlignment="Right"
+                     VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,0" />
 
-         </Grid>
+            </Grid>
 
-         <UniformGrid Columns="3" Margin="0,10,0,0">
+            <UniformGrid Columns="3" Margin="0,10,0,0">
 
-            <Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
-               <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/PlayStep.png"
-                      HorizontalAlignment="Center" VerticalAlignment="Center"
-                      Height="50" Width="50"/>
-            </Button>
+               <Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
+                  <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/PlayStep.png"
+                         HorizontalAlignment="Center" VerticalAlignment="Center"
+                         Height="50" Width="50"/>
+               </Button>
 
-            <Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
-               <Image Source="{Binding PlayPauseImage}" HorizontalAlignment="Center"
-                   VerticalAlignment="Center" Height="50" Width="50"/>
-            </Button>
+               <Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
+                  <Image Source="{Binding PlayPauseImage}" HorizontalAlignment="Center"
+                      VerticalAlignment="Center" Height="50" Width="50"/>
+               </Button>
 
-            <Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
-               <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/Stop.png"
-                      HorizontalAlignment="Center" VerticalAlignment="Center"
-                      Height="50" Width="50"/>
-            </Button>
+               <Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3" Style="{StaticResource EgtCAM5_SimulationButton}">
+                  <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/Stop.png"
+                         HorizontalAlignment="Center" VerticalAlignment="Center"
+                         Height="50" Width="50"/>
+               </Button>
 
-         </UniformGrid>
+            </UniformGrid>
 
-         <Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="40"
-                 Minimum="1"  Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
-                 Margin="10,10,10,0" Value="{Binding SliderValue}"/>
+            <Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="40"
+                    Minimum="1"  Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
+                    Margin="10,10,10,0" Value="{Binding SliderValue}"/>
 
-      </StackPanel>
-   </Expander>
+         </StackPanel>
+      </Expander>
+
+      <Button Content="GENERATE" Height="30" Command="{Binding GenerateCommand}"/>
+
+   </StackPanel>
 
 </UserControl>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
index e0ba793..28c25cd 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtUILib
+
 Namespace EgtCAM5
 
    Public Class SimulationExpanderViewModel
@@ -259,6 +261,7 @@ Namespace EgtCAM5
       Private m_cmdStep As ICommand
       Private m_cmdPlayPause As ICommand
       Private m_cmdStop As ICommand
+      Private m_cmdGenerate As ICommand
 
 #End Region
 
@@ -422,6 +425,39 @@ Namespace EgtCAM5
 
 #End Region ' StopCommand
 
+#Region "GenerateCommand"
+
+      ''' <summary>
+      ''' Returns a command that create a new tool.
+      ''' </summary>
+      Public ReadOnly Property GenerateCommand As ICommand
+         Get
+            If m_cmdGenerate Is Nothing Then
+               m_cmdGenerate = New RelayCommand(AddressOf Generate, AddressOf CanGenerate)
+            End If
+            Return m_cmdGenerate
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Creata the new tool.  This method is invoked by the NewCommand.
+      ''' </summary>
+      Public Sub Generate(ByVal param As Object)
+         Dim sInfo As String = "EgtCAM5"
+         Dim sCurrFilePath As String = String.Empty
+         EgtGetCurrFilePath(sCurrFilePath)
+         EgtGenerate(Path.ChangeExtension(sCurrFilePath, ".cnc"), sInfo)
+      End Sub
+
+      ''' <summary>
+      ''' Returns true if the selected treeviewitem is valid for new tool creation.
+      ''' </summary>
+      Private Function CanGenerate(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' GenerateCommand
+
 #End Region
 
 #Region "METHODS"
diff --git a/ProjectPage/OptionPanel/OptionPanelView.xaml b/ProjectPage/OptionPanel/OptionPanelView.xaml
index ac878e0..ce79874 100644
--- a/ProjectPage/OptionPanel/OptionPanelView.xaml
+++ b/ProjectPage/OptionPanel/OptionPanelView.xaml
@@ -1,9 +1,10 @@
 <UserControl x:Class="OptionPanelView"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
    xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
-   <StackPanel Background="Transparent">
+   <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the ManageLayerExpander-->
       <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
       <!--ContentPresenter that contains the InfoExpander-->
diff --git a/ProjectPage/OptionPanel/OptionPanelView.xaml.vb b/ProjectPage/OptionPanel/OptionPanelView.xaml.vb
index b165729..7ac40e0 100644
--- a/ProjectPage/OptionPanel/OptionPanelView.xaml.vb
+++ b/ProjectPage/OptionPanel/OptionPanelView.xaml.vb
@@ -1,3 +1,7 @@
-Public Class DrawOptionPanelView
+Public Class OptionPanelView
+
+   Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
+      Dim x = ciao.MaxHeight
+   End Sub
 
 End Class
diff --git a/ToolsDbWindow/ToolTreeView2.vb b/ToolsDbWindow/ToolTreeView2.vb
index 4eea397..c0b4509 100644
--- a/ToolsDbWindow/ToolTreeView2.vb
+++ b/ToolsDbWindow/ToolTreeView2.vb
@@ -903,7 +903,7 @@ Public Class ToolTreeViewItem
       EgtTdbSetCurrToolParam(MCH_TP.TCPOS, TcPos)
    End Sub
 
-   Private Sub WriteToolName()
+   Public Sub WriteToolName()
       EgtTdbSetCurrToolParam(MCH_TP.NAME, NamePar)
    End Sub
 
@@ -1156,7 +1156,7 @@ Public Class ToolTreeViewItem
       End Get
    End Property
 
-   Private Sub IsModifiedReset()
+   Public Sub IsModifiedReset()
       m_IsModifiedCorr = False
       m_IsModifiedExit = False
       m_IsModifiedCornRad = False
diff --git a/ToolsDbWindow/ToolsDbViewModel.vb b/ToolsDbWindow/ToolsDbViewModel.vb
index 2488708..a5a87f3 100644
--- a/ToolsDbWindow/ToolsDbViewModel.vb
+++ b/ToolsDbWindow/ToolsDbViewModel.vb
@@ -386,8 +386,12 @@ Namespace EgtCAM5
                      ToolFamily.Items.Add(NewToolItem)
                      EgtTdbSaveCurrTool()
                      NewToolItem.NewTool = True
+                     ' Reimposto l'utensile vecchio nel Db per deselezionarlo e fare le verifiche correttamente
+                     EgtTdbSetCurrTool(ToolCopied.Name)
+                     ToolCopied.IsSelected = False
+                     ToolCopied.NotifyPropertyChanged("IsSelected")
                      NewToolItem.IsSelected = True
-                     NewToolItem.NotifyPropertyChanged("IsSelected")
+                     'NewToolItem.NotifyPropertyChanged("IsSelected")
                      Exit For
                   End If
                Next
@@ -406,7 +410,8 @@ Namespace EgtCAM5
             ' Verifico se sia selezionato un utensile
          ElseIf TypeOf param Is ToolTreeViewItem Then
             ' Verifico che i parametri dell'utensile siano validi
-            Return DirectCast(param, ToolTreeViewItem).IsValid
+            Dim SelectedTool As ToolTreeViewItem = DirectCast(param, ToolTreeViewItem)
+            Return SelectedTool.IsValid And Not SelectedTool.IsModified
          Else
             Return False
          End If
@@ -433,14 +438,16 @@ Namespace EgtCAM5
       ''' </summary>
       Public Sub Save(ByVal param As Object)
          Dim CurrTool As ToolTreeViewItem = DirectCast(param, ToolTreeViewItem)
-         CurrTool.m_Name = CurrTool.m_Name.Trim()
          CurrTool.WriteToolParam()
+         CurrTool.m_Name = CurrTool.m_Name.Trim()
+         CurrTool.WriteToolName()
          If IsUUID(Path.GetFileNameWithoutExtension(CurrTool.m_Draw)) Then
             CurrTool.SaveToolDraw()
          End If
          EgtTdbSaveCurrTool()
          EgtTdbSave()
          CurrTool.NewTool = False
+         CurrTool.IsModifiedReset()
       End Sub
 
       ''' <summary>
@@ -451,7 +458,7 @@ Namespace EgtCAM5
          If TypeOf param Is ToolTreeViewItem Then
             Dim Tool As ToolTreeViewItem = DirectCast(param, ToolTreeViewItem)
             ' Verifico che i parametri dell'utensile siano validi
-            Return (Tool.IsValid And Tool.IsModified) Or Tool.NewTool
+            Return (Tool.IsValid And (Tool.IsModified Or Tool.NewTool))
          Else
             Return False
          End If