diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
index cf409be..19d0888 100644
--- a/AboutBoxWindow/AboutBoxView.xaml
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -1,8 +1,8 @@
 <Window x:Class="AboutBoxWndV"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
+        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -35,15 +35,15 @@
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18" />
+                    VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="12" />
+                    VerticalAlignment="Center" FontSize="12" />
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-               Margin="100,0"/>
+                 Margin="100,0"/>
 
       </Grid>
 
diff --git a/Base/TabViewModel.vb b/Base/TabViewModel.vb
index 9d8426a..b55ac62 100644
--- a/Base/TabViewModel.vb
+++ b/Base/TabViewModel.vb
@@ -9,7 +9,7 @@
       Set(value As String)
          If value <> m_sTabName Then
             m_sTabName = value
-            OnPropertyChanged("sTabName")
+            OnPropertyChanged(NameOf(sTabName))
          End If
       End Set
    End Property
diff --git a/Base/TreeView/TreeViewItemBase.vb b/Base/TreeView/TreeViewItemBase.vb
index eba277f..8129309 100644
--- a/Base/TreeView/TreeViewItemBase.vb
+++ b/Base/TreeView/TreeViewItemBase.vb
@@ -13,7 +13,7 @@ Public Class TreeViewItemBase
       Set(value As String)
          If (value <> m_Name) Then
             m_Name = value
-            NotifyPropertyChanged("Name")
+            NotifyPropertyChanged(NameOf(Name))
          End If
       End Set
    End Property
@@ -26,7 +26,7 @@ Public Class TreeViewItemBase
       Set(value As Boolean)
          If (value <> m_isSelected) Then
             m_isSelected = value
-            NotifyPropertyChanged("IsSelected")
+            NotifyPropertyChanged(NameOf(IsSelected))
          End If
       End Set
    End Property
@@ -39,7 +39,7 @@ Public Class TreeViewItemBase
       Set(value As Boolean)
          If (value <> m_isExpanded) Then
             m_isExpanded = value
-            NotifyPropertyChanged("IsExpanded")
+            NotifyPropertyChanged(NameOf(IsExpanded))
          End If
       End Set
    End Property
@@ -52,7 +52,7 @@ Public Class TreeViewItemBase
       Set(value As Boolean)
          If value <> m_IsActive Then
             m_IsActive = value
-            NotifyPropertyChanged("IsActive")
+            NotifyPropertyChanged(NameOf(IsActive))
          End If
       End Set
    End Property
@@ -64,7 +64,7 @@ Public Class TreeViewItemBase
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         NotifyPropertyChanged("IsEnabled")
+         NotifyPropertyChanged(NameOf(IsEnabled))
       End Set
    End Property
 
@@ -99,7 +99,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If (value <> m_Name) Then
             m_Name = value
-            NotifyPropertyChanged("Name")
+            NotifyPropertyChanged(NameOf(Name))
          End If
       End Set
    End Property
@@ -112,7 +112,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_IsSelected) Then
             m_IsSelected = value
-            NotifyPropertyChanged("IsSelected")
+            NotifyPropertyChanged(NameOf(IsSelected))
          End If
       End Set
    End Property
@@ -125,7 +125,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If (value <> m_isExpanded) Then
             m_isExpanded = value
-            NotifyPropertyChanged("IsExpanded")
+            NotifyPropertyChanged(NameOf(IsExpanded))
          End If
       End Set
    End Property
@@ -138,7 +138,7 @@ Public Class InheritableTreeViewItem
       Set(value As Boolean)
          If value <> m_IsActive Then
             m_IsActive = value
-            NotifyPropertyChanged("IsActive")
+            NotifyPropertyChanged(NameOf(IsActive))
          End If
       End Set
    End Property
@@ -150,7 +150,7 @@ Public Class InheritableTreeViewItem
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         NotifyPropertyChanged("IsEnabled")
+         NotifyPropertyChanged(NameOf(IsEnabled))
       End Set
    End Property
 
@@ -162,7 +162,7 @@ Public Class InheritableTreeViewItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged("PictureString")
+            NotifyPropertyChanged(NameOf(PictureString))
          End If
       End Set
    End Property
@@ -204,7 +204,7 @@ Public Class ParentItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged("PictureString")
+            NotifyPropertyChanged(NameOf(PictureString))
          End If
       End Set
    End Property
@@ -242,7 +242,7 @@ Public Class ChildItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged("PictureString")
+            NotifyPropertyChanged(NameOf(PictureString))
          End If
       End Set
    End Property
diff --git a/CurrSetUp/CurrSetUpVM.vb b/CurrSetUp/CurrSetUpVM.vb
index 22dbac6..7570fc5 100644
--- a/CurrSetUp/CurrSetUpVM.vb
+++ b/CurrSetUp/CurrSetUpVM.vb
@@ -1,6 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports System.ComponentModel
-Imports System.IO
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -100,7 +98,7 @@ Public Class CurrSetUpVM
    ' Funzione che verifica se ci sono state modifiche all'attrezzaggio corrente e permette di attivare e disattivare il bottone applica
    Private Sub IsEnabledBtns()
       m_Apply_IsEnabled = Not m_SetUpVM.IsAppliedSetUp()
-      NotifyPropertyChanged("Apply_IsEnabled")
+      NotifyPropertyChanged(NameOf(Apply_IsEnabled))
    End Sub
 
 #Region "COMMANDS"
diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index 4714171..2529567 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -9,89 +9,89 @@
 
    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
-         IsExpanded="{Binding Draw2DIsExpanded}">
+                IsExpanded="{Binding Draw2DIsExpanded}">
          <Expander.Header>
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding AngularDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding AngularDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/AngularDimension.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding DiamRadDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding DiamRadDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/DiametralDimension.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -103,93 +103,93 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding StmMoveVertexFacetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MoveStmVertexFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/StmMoveVertex.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -200,123 +200,123 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStatusToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeStatusCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStatus.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True" 
-               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True" 
+                    Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-             </Button>
-             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                ToolTipService.ShowOnDisabled="True"
-                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
-                <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-             </Button>
-             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                ToolTipService.ShowOnDisabled="True"
-                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
-                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-             </Button>
+            </Button>
+            <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -327,8 +327,8 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
             </Button>
             <Button Style="{StaticResource DrawPanelButton}"
@@ -336,33 +336,33 @@
             <Button Style="{StaticResource DrawPanelButton}"
                     Visibility="Hidden"/>
             <Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 20ffab5..796b07c 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -425,7 +425,6 @@ Public Class DrawPanelVM
       OnPropertyChanged(NameOf(DrawPanel_Visibility))
    End Sub
 
-
 #Region "Button state"
 
    Private m_bLayerOk As Boolean
@@ -435,7 +434,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bLayerOk = value
-         OnPropertyChanged("bLayerOk")
+         OnPropertyChanged(NameOf(bLayerOk))
       End Set
    End Property
    Private m_bSelOk As Boolean
@@ -445,7 +444,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bSelOk = value
-         OnPropertyChanged("bSelOk")
+         OnPropertyChanged(NameOf(bSelOk))
       End Set
    End Property
    Private m_bLayerOkAndSelOk As Boolean
@@ -455,7 +454,7 @@ Public Class DrawPanelVM
       End Get
       Set(value As Boolean)
          m_bLayerOkAndSelOk = value
-         OnPropertyChanged("bLayerOkAndSelOk")
+         OnPropertyChanged(NameOf(bLayerOkAndSelOk))
       End Set
    End Property
 
diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
index 833abd1..78f9006 100644
--- a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
+++ b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
@@ -1,14 +1,14 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="EstimationsDetailsWndV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding TitleMsg}"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-   Width="300" Height="300"
-   IsResizable="True"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding TitleMsg}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
+                            Width="300" Height="300"
+                            IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+
    <WebBrowser Name="EstimationsWebBrowser" Margin="10"/>
-   
+
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
index 755ea61..73cb544 100644
--- a/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
+++ b/EstimationsDetailsWnd/EstimationsDetailsWndVM.vb
@@ -22,10 +22,6 @@ Public Class EstimationsDetailsWndVM
 
 #End Region    ' Messages
 
-   ' Definizione comandi
-   Private m_cmdOk As ICommand
-   Private m_cmdCancel As ICommand
-
 #End Region    'FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
@@ -36,8 +32,4 @@ Public Class EstimationsDetailsWndVM
 
 #End Region    ' CONSTRUCTOR
 
-#Region "METHODS"
-
-#End Region    ' METHODS
-
 End Class
diff --git a/ExecutePanel/ExecutePanelV.xaml b/ExecutePanel/ExecutePanelV.xaml
index d914077..c41b52b 100644
--- a/ExecutePanel/ExecutePanelV.xaml
+++ b/ExecutePanel/ExecutePanelV.xaml
@@ -6,7 +6,7 @@
 
    <StackPanel Orientation="Horizontal">
       <Button Command="{Binding ExecCommand}" ToolTip="{Binding ExecToolTip}"
-         Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
+              Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruScriptNames}" ItemContainerStyle="{StaticResource MruScriptItem}">
             </ContextMenu>
diff --git a/GridPanel/GridPanelV.xaml b/GridPanel/GridPanelV.xaml
index 7fb3e1e..c092863 100644
--- a/GridPanel/GridPanelV.xaml
+++ b/GridPanel/GridPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="GridPanelV"
-   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">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">
diff --git a/InstrumentPanel/InstrumentPanelV.xaml b/InstrumentPanel/InstrumentPanelV.xaml
index a121aaa..6b900c4 100644
--- a/InstrumentPanel/InstrumentPanelV.xaml
+++ b/InstrumentPanel/InstrumentPanelV.xaml
@@ -1,17 +1,15 @@
 <EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
-   TitleBarOrientation="Horizontal">
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
+                              TitleBarOrientation="Horizontal">
 
-   <!--<StackPanel Background="Transparent" Orientation="Horizontal">-->
-      <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
-         <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
-      </ToggleButton>
-      <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
-         <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
-      </ToggleButton>
-   <!--</StackPanel>-->
+   <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
+      <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
+   </ToggleButton>
+   <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
+      <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
+   </ToggleButton>
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/InstrumentPanel/InstrumentPanelVM.vb b/InstrumentPanel/InstrumentPanelVM.vb
index e927fb0..2b967e5 100644
--- a/InstrumentPanel/InstrumentPanelVM.vb
+++ b/InstrumentPanel/InstrumentPanelVM.vb
@@ -37,7 +37,7 @@ Public Class InstrumentPanelVM
                Analyze.EraseAnalyzeGroup()
                EgtDraw()
             End If
-            OnPropertyChanged("AnalyzeIsChecked")
+            OnPropertyChanged(NameOf(AnalyzeIsChecked))
          End If
       End Set
    End Property
@@ -50,7 +50,7 @@ Public Class InstrumentPanelVM
       Set(value As Boolean)
          If value <> m_AnalyzeIsEnabled Then
             m_AnalyzeIsEnabled = value
-            OnPropertyChanged("AnalyzeIsEnabled")
+            OnPropertyChanged(NameOf(AnalyzeIsEnabled))
          End If
       End Set
    End Property
@@ -70,7 +70,7 @@ Public Class InstrumentPanelVM
                Map.refProjectVM.GetScene.ResetStatusGetDistance()
                Map.refStatusBarVM.NotifyStatusOutput(String.Empty)
             End If
-            OnPropertyChanged("GetDistIsChecked")
+            OnPropertyChanged(NameOf(GetDistIsChecked))
          End If
       End Set
    End Property
diff --git a/MachGroupPanel/MyMachGroupPanelVM.vb b/MachGroupPanel/MyMachGroupPanelVM.vb
index 0ceba22..cc81e1c 100644
--- a/MachGroupPanel/MyMachGroupPanelVM.vb
+++ b/MachGroupPanel/MyMachGroupPanelVM.vb
@@ -1,8 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtCAM5.MyMachinePanelVM
-Imports System.Security.Cryptography
-Imports System.Windows.Forms.AxHost
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
diff --git a/MachOptionsWindow/MachOptionV.xaml b/MachOptionsWindow/MachOptionV.xaml
index 07039ed..65f9464 100644
--- a/MachOptionsWindow/MachOptionV.xaml
+++ b/MachOptionsWindow/MachOptionV.xaml
@@ -1,21 +1,21 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MachOptionV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:SplitArcTypeConverter x:Key="SplitArcTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid Margin="10">
-      <Grid.ColumnDefinitions>          
+      <Grid.ColumnDefinitions>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
@@ -69,5 +69,5 @@
       </UniformGrid>
 
    </Grid>
-   
+
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/MachinePanel/MachinePanelV.xaml b/MachinePanel/MachinePanelV.xaml
index 1833b32..0c697c6 100644
--- a/MachinePanel/MachinePanelV.xaml
+++ b/MachinePanel/MachinePanelV.xaml
@@ -7,14 +7,14 @@
    <StackPanel Orientation="Horizontal">
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
-          SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-          Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
+                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+                Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
       <Button Content="{Binding ToolDBMsg}"
-            Command="{Binding ToolDbCommand}"
-            IsEnabled="{Binding ToolDb_IsEnabled}"
-            Width="55"
-            ToolTip="{Binding ToolDBToolTip}"
-            Style="{StaticResource GridViewPanelButton}"/>
+              Command="{Binding ToolDbCommand}"
+              IsEnabled="{Binding ToolDb_IsEnabled}"
+              Width="55"
+              ToolTip="{Binding ToolDBToolTip}"
+              Style="{StaticResource GridViewPanelButton}"/>
       <Button Content="{Binding MachiningDbMsg}"
               Command="{Binding MachDbCommand}"
               IsEnabled="{Binding MachDb_IsEnabled}"
@@ -28,10 +28,10 @@
               ToolTip="{Binding SetUpDbToolTip}"
               Style="{StaticResource GridViewPanelButton}"/>
       <Button Command="{Binding MachOptionsCommand}"
-            ToolTip="{Binding MachOptionsToolTip}">
-          <Image Source="/Resources/MachinePanel/MachineOptions.png"
-              Height="22" />
+              ToolTip="{Binding MachOptionsToolTip}">
+         <Image Source="/Resources/MachinePanel/MachineOptions.png"
+                Height="22" />
       </Button>
-    </StackPanel>
+   </StackPanel>
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb
index be7d48a..bedf083 100644
--- a/MachinePanel/MyMachinePanelVM.vb
+++ b/MachinePanel/MyMachinePanelVM.vb
@@ -64,8 +64,7 @@ Public Class MyMachinePanelVM
                IniFile.m_sCurrMachToolsDirPath = m_SelectedMachine.MachineDirPath & "\Tools"
                IniFile.m_sCurrMachSetUpDirPath = m_SelectedMachine.MachineDirPath & "\SetUp"
                IniFile.m_sCurrMachScriptsDirPath = m_SelectedMachine.MachineDirPath & "\Scripts"
-               'UpdateToolAndMachDbParamVisibility()
-               NotifyPropertyChanged("SelectedMachine")
+               NotifyPropertyChanged(NameOf(SelectedMachine))
             End If
          End If
       End Set
@@ -78,7 +77,7 @@ Public Class MyMachinePanelVM
       End Get
       Set(value As Boolean)
          m_MachineListIsEnabled = value
-         NotifyPropertyChanged("MachineListIsEnabled")
+         NotifyPropertyChanged(NameOf(MachineListIsEnabled))
       End Set
    End Property
 
@@ -235,12 +234,6 @@ Public Class MyMachinePanelVM
          MessageBox.Show(EgtMsg(MSG_TOOLSERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
-      'Dim ToolDbWindow As New ToolsDbV
-      'ToolDbWindow.Height = 640
-      'ToolDbWindow.Width = 1024
-      'ToolDbWindow.DataContext = New ToolsDbVM
-      'ToolDbWindow.Owner = Application.Current.MainWindow
-      'ToolDbWindow.ShowDialog()
 
       Dim sMachineDir As String = IniFile.m_sMachinesRoot & "\" & IniFile.m_sMachineName
       Dim ToolDbWindowVM As New MyToolDbWindowVM(sMachineDir, IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9)
@@ -358,11 +351,10 @@ Public Class MyMachinePanelVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Overrides Sub MachOptions(ByVal param As Object)
-      Dim MachOptionWindow As New MachOptionV
-      'MachOptionWindow.Height = 614
-      'MachOptionWindow.Width = 256
-      MachOptionWindow.DataContext = New MachOptionVM
-      MachOptionWindow.Owner = Application.Current.MainWindow
+      Dim MachOptionWindow As New MachOptionV With {
+         .DataContext = New MachOptionVM,
+         .Owner = Application.Current.MainWindow
+      }
       MachOptionWindow.ShowDialog()
    End Sub
 
@@ -448,14 +440,4 @@ Public Class MyMachinePanelVM
 
    End Class
 
-   'Private Sub UpdateToolAndMachDbParamVisibility()
-   '   If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWINGONARCS, 0, IniFile.m_sCurrMachIniFilePath) <> 0 Then
-   '      Sawing(39) = Visibility.Visible                               ' StepExtArc
-   '      Sawing(40) = Visibility.Visible                               ' StepIntArc
-   '   Else
-   '      Sawing(39) = Visibility.Collapsed                               ' StepExtArc
-   '      Sawing(40) = Visibility.Collapsed                               ' StepIntArc
-   '   End If
-   'End Sub
-
 End Class
\ No newline at end of file
diff --git a/MachiningDbWindow/MyMachiningDbV.xaml b/MachiningDbWindow/MyMachiningDbV.xaml
index b176915..831cc49 100644
--- a/MachiningDbWindow/MyMachiningDbV.xaml
+++ b/MachiningDbWindow/MyMachiningDbV.xaml
@@ -12,7 +12,7 @@
 
    <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
-         CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
+                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -78,7 +78,6 @@
                         <ColumnDefinition Width="1*"/>
                      </Grid.ColumnDefinitions>
 
-                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
                      <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
 
                   </Grid>
diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml
index 6fb1bfa..e2d96ec 100644
--- a/MainWindow/MainWindowV.xaml
+++ b/MainWindow/MainWindowV.xaml
@@ -1,16 +1,16 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-   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:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:local="clr-namespace:EgtCAM5"
-   Title="{Binding Title}" Icon="{Binding IconSource}"
-   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
-   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
-   AboutBoxCommand="{Binding AboutBoxCommand}"
-   AllowDrop="True" Drop="MainWindow_Drop"
-   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+                            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:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            Title="{Binding Title}" Icon="{Binding IconSource}"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
+                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
+                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+                            AboutBoxCommand="{Binding AboutBoxCommand}"
+                            AllowDrop="True" Drop="MainWindow_Drop"
+                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
    </EgtWPFLib5:EgtCustomWindow.TitlePanel>
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 406c184..114c365 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -88,8 +88,9 @@ Public Class MainWindowVM
       Get
          If m_bFirstProjectPage Then
             m_bFirstProjectPage = False
-            m_ProjectPage = New ProjectV
-            m_ProjectPage.DataContext = New ProjectVM
+            m_ProjectPage = New ProjectV With {
+               .DataContext = New ProjectVM
+            }
          End If
          Return m_ProjectPage
       End Get
@@ -597,6 +598,9 @@ Public Class MainWindowVM
          ' pulisco output
          Map.refStatusBarVM.NotifyStatusOutput("")
          Map.refInputExpanderVM.ResetInputBox()
+      ElseIf e.Key = Key.Left AndAlso Map.refTopCommandBarVM.MachiningIsChecked AndAlso Map.refOperationParametersExpanderVM.OperationParameters.IsEnabled Then
+         Map.refMachiningParameterExpanderVM.FocusSlider()
+         e.Handled = True
       End If
    End Sub
 
diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
index 734f7c4..723305f 100644
--- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <Expander IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
-      Style="{StaticResource ExpanderStyle}">
+             Style="{StaticResource ExpanderStyle}">
       <Expander.Header>
          <TextBlock Text="{Binding PropertiesMsg}"/>
       </Expander.Header>
diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb
index 4d7d69a..40fa3ea 100644
--- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderVM.vb
@@ -21,7 +21,7 @@ Public Class InfoExpanderVM
       Set(value As Boolean)
          If value <> m_IsExpanded Then
             m_IsExpanded = value
-            OnPropertyChanged("IsEnabled")
+            OnPropertyChanged(NameOf(IsEnabled))
          End If
       End Set
    End Property
@@ -39,7 +39,7 @@ Public Class InfoExpanderVM
             Else
                IsEnabled = False
             End If
-            OnPropertyChanged("InfoBox")
+            OnPropertyChanged(NameOf(InfoBox))
          End If
       End Set
    End Property
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
index 98ec228..5c4c400 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="InputExpanderV"
-   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">
 
    <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}"
-      Style="{StaticResource ExpanderStyle}">
+             Style="{StaticResource ExpanderStyle}">
       <StackPanel>
          <StackPanel.Style>
             <Style TargetType="{x:Type StackPanel}">
@@ -33,9 +33,9 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Button Command="{Binding ShowCommand}" Visibility="{Binding ShowBtnVisibility}"
-               Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+                    Content="{Binding ShowMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
             <Button Command="{Binding DoneCommand}" Grid.Column="1"
-               Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+                    Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
          </Grid>
       </StackPanel>
    </Expander>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
index 3421f21..20778ba 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
@@ -14,7 +14,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsExpanded = value
-         OnPropertyChanged("IsExpanded")
+         OnPropertyChanged(NameOf(IsExpanded))
       End Set
    End Property
 
@@ -25,7 +25,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_IsEnabled = value
-         OnPropertyChanged("IsEnabled")
+         OnPropertyChanged(NameOf(IsEnabled))
       End Set
    End Property
 
@@ -36,7 +36,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_Title = value
-         OnPropertyChanged("Title")
+         OnPropertyChanged(NameOf(Title))
       End Set
    End Property
 
@@ -48,7 +48,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_TextBlock = value
-         OnPropertyChanged("TextBlock")
+         OnPropertyChanged(NameOf(TextBlock))
       End Set
    End Property
 
@@ -61,7 +61,7 @@ Public Class InputExpanderVM
       Set(value As String)
          m_TextBox = value
          Map.refProjectVM.NotifyInputText(value)
-         OnPropertyChanged("TextBox")
+         OnPropertyChanged(NameOf(TextBox))
       End Set
    End Property
 
@@ -73,7 +73,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_TextVisibility Then
             m_TextVisibility = value
-            OnPropertyChanged("TextVisibility")
+            OnPropertyChanged(NameOf(TextVisibility))
          End If
       End Set
    End Property
@@ -85,7 +85,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Boolean)
          m_FocusTextBox = value
-         OnPropertyChanged("FocusTextBox")
+         OnPropertyChanged(NameOf(FocusTextBox))
       End Set
    End Property
 
@@ -97,7 +97,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As String)
          m_CheckBoxText = value
-         OnPropertyChanged("CheckBoxText")
+         OnPropertyChanged(NameOf(CheckBoxText))
       End Set
    End Property
 
@@ -110,7 +110,7 @@ Public Class InputExpanderVM
          If value <> m_IsChecked Then
             Map.refProjectVM.SetLastBoolean(value)
             m_IsChecked = value
-            OnPropertyChanged("IsChecked")
+            OnPropertyChanged(NameOf(IsChecked))
          End If
       End Set
    End Property
@@ -123,7 +123,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_CheckVisibility Then
             m_CheckVisibility = value
-            OnPropertyChanged("CheckVisibility")
+            OnPropertyChanged(NameOf(CheckVisibility))
          End If
       End Set
    End Property
@@ -136,7 +136,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As ObservableCollection(Of String))
          m_ComboItemsList = value
-         OnPropertyChanged("ComboItemsList")
+         OnPropertyChanged(NameOf(ComboItemsList))
       End Set
    End Property
 
@@ -148,7 +148,7 @@ Public Class InputExpanderVM
       Set(value As Integer)
          Map.refProjectVM.SetLastInteger(value)
          m_ComboSelectedIndex = value
-         OnPropertyChanged("ComboSelectedIndex")
+         OnPropertyChanged(NameOf(ComboSelectedIndex))
       End Set
    End Property
 
@@ -160,7 +160,7 @@ Public Class InputExpanderVM
       Set(value As Visibility)
          If value <> m_ComboVisibility Then
             m_ComboVisibility = value
-            OnPropertyChanged("ComboVisibility")
+            OnPropertyChanged(NameOf(ComboVisibility))
          End If
       End Set
    End Property
@@ -173,7 +173,7 @@ Public Class InputExpanderVM
       End Get
       Set(value As Visibility)
          m_ShowBtnVisibility = value
-         OnPropertyChanged("ShowBtnVisibility")
+         OnPropertyChanged(NameOf(ShowBtnVisibility))
       End Set
    End Property
 
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
index b4031f9..ac1c4c9 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/LayerTreeView.vb
@@ -115,7 +115,7 @@ Public Class LayerTreeViewItem
    Public Sub SetHidden(bVal As Boolean)
       If bVal <> m_bHidden Then
          m_bHidden = bVal
-         NotifyPropertyChanged("IsHidden")
+         NotifyPropertyChanged(Name(IsHidden))
       End If
    End Sub
 
@@ -127,7 +127,7 @@ Public Class LayerTreeViewItem
       Set(value As String)
          If value <> m_sPictureString Then
             m_sPictureString = value
-            NotifyPropertyChanged("PictureString")
+            NotifyPropertyChanged(NameOf(PictureString))
          End If
       End Set
    End Property
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
index e8de67e..f954b7c 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderV.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="ManageLayerExpanderV"
-   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:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
-   xmlns:local="clr-namespace:EgtCAM5">
+             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:expression="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
+             xmlns:local="clr-namespace:EgtCAM5">
 
    <Expander IsExpanded="True" Style="{StaticResource ExpanderStyle}">
       <Expander.Header>
@@ -20,11 +20,11 @@
             <Button Content="{Binding NewLayerMsg}" Command="{Binding NewLayerCommand}"  Height="30"/>
             <Button Content="{Binding ColorMsg}" Command="{Binding LayerColorCommand}"  Height="30"/>
          </UniformGrid>
-         
+
          <TreeView Name="LayerTreeView" MinHeight="150" MaxHeight="250" 
-            ItemsSource="{Binding Path=LayerList}"
-            VirtualizingStackPanel.IsVirtualizing = "True"
-            VirtualizingStackPanel.VirtualizationMode = "Recycling">
+                   ItemsSource="{Binding Path=LayerList}"
+                   VirtualizingStackPanel.IsVirtualizing = "True"
+                   VirtualizingStackPanel.VirtualizationMode = "Recycling">
             <interactivity:Interaction.Triggers>
                <interactivity:EventTrigger EventName="MouseDoubleClick">
                   <interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}"/>
@@ -61,7 +61,7 @@
             </TreeView.Resources>
 
             <!--Style dei nodi CathegoryItem che li riquadra di azzurro quando clicckati ed elimina l'ombra grigia 
-            che si presenta quando la categoria rimane vuota (ombra causata dal multibinding).--> 
+            che si presenta quando la categoria rimane vuota (ombra causata dal multibinding).-->
             <TreeView.ItemContainerStyle>
                <Style TargetType="{x:Type TreeViewItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
diff --git a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
index 59ad21b..0779556 100644
--- a/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderVM.vb
@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports EgtUILib
-Imports EgtCAM5.IniFile
 
 Public Class ManageLayerExpanderVM
    Inherits ViewModelBase
@@ -15,7 +14,7 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As String)
          m_HeaderName = value
-         OnPropertyChanged("HeaderName")
+         OnPropertyChanged(NameOf(HeaderName))
       End Set
    End Property
 
@@ -26,7 +25,7 @@ Public Class ManageLayerExpanderVM
       End Get
       Set(value As SolidColorBrush)
          m_HeaderColor = value
-         OnPropertyChanged("HeaderColor")
+         OnPropertyChanged(NameOf(HeaderColor))
       End Set
    End Property
 
@@ -835,6 +834,7 @@ Public Class ManageLayerExpanderVM
       Return Nothing
    End Function
 
+
 #End Region    ' Methods
 
 End Class
diff --git a/OptionPanel/DrawOptionPanelVM.vb b/OptionPanel/DrawOptionPanelVM.vb
index 56dbea7..fbea97c 100644
--- a/OptionPanel/DrawOptionPanelVM.vb
+++ b/OptionPanel/DrawOptionPanelVM.vb
@@ -8,8 +8,9 @@ Public Class DrawOptionPanelVM
    Public ReadOnly Property ManageLayerExpander As ContentControl
       Get
          If IsNothing(m_ManageLayerExpander) Then
-            m_ManageLayerExpander = New ManageLayerExpanderV
-            m_ManageLayerExpander.DataContext = New ManageLayerExpanderVM
+            m_ManageLayerExpander = New ManageLayerExpanderV With {
+               .DataContext = New ManageLayerExpanderVM
+            }
          End If
          Return m_ManageLayerExpander
       End Get
@@ -19,8 +20,9 @@ Public Class DrawOptionPanelVM
    Public ReadOnly Property InfoExpander As ContentControl
       Get
          If IsNothing(m_InfoExpander) Then
-            m_InfoExpander = New InfoExpanderV
-            m_InfoExpander.DataContext = New InfoExpanderVM
+            m_InfoExpander = New InfoExpanderV With {
+               .DataContext = New InfoExpanderVM
+            }
          End If
          Return m_InfoExpander
       End Get
@@ -30,8 +32,9 @@ Public Class DrawOptionPanelVM
    Public ReadOnly Property InputExpander As ContentControl
       Get
          If IsNothing(m_InputExpander) Then
-            m_InputExpander = New InputExpanderV
-            m_InputExpander.DataContext = New InputExpanderVM
+            m_InputExpander = New InputExpanderV With {
+               .DataContext = New InputExpanderVM
+            }
          End If
          Return m_InputExpander
       End Get
diff --git a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb
index 005caa7..a9c0c11 100644
--- a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb
+++ b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpander.vb
@@ -1,5 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -29,7 +28,7 @@ Public Class EstimationsExpanderVM
       End Get
       Set(value As Boolean)
          m_Estimation_IsEnabled = value
-         NotifyPropertyChanged("Estimation_IsEnabled")
+         NotifyPropertyChanged(NameOf(Estimation_IsEnabled))
       End Set
    End Property
 
diff --git a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
index 4d8c339..0682e25 100644
--- a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
@@ -1,9 +1,7 @@
 <UserControl x:Class="EstimationsExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-   
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
    <StackPanel>
 
       <Expander Header="{Binding EstimationMsg}"
diff --git a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml
index d3a90e7..e258e67 100644
--- a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderV.xaml
@@ -1,19 +1,13 @@
 <UserControl x:Class="MachiningTreeExpanderV"
-   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:local="clr-namespace:EgtCAM5">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:EgtCAM5">
 
    <Expander Header="{Binding MachListHdr}" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
-      Style="{StaticResource ExpanderStyle}">
+             Style="{StaticResource ExpanderStyle}">
       <UniformGrid MaxHeight="300">
          <TreeView Name="MachiningsTreeView" Grid.Row="1"
             ItemsSource="{Binding Path=MachiningsList}">
-            <!--<interactivity:Interaction.Triggers>
-               <interactivity:EventTrigger EventName="MouseDoubleClick">
-                  <interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}" CommandParameter="{Binding ElementName=MachiningsTreeView,Path=SelectedItem}"/>
-               </interactivity:EventTrigger>
-            </interactivity:Interaction.Triggers>-->
             <TreeView.InputBindings>
                <KeyBinding Key="Escape" Command="{Binding CancelNewCommand}" CommandParameter="Escape"/>
             </TreeView.InputBindings>
@@ -34,7 +28,7 @@
                   </Grid>
 
                   <!--Assegna ai nodi ToolItem lo Style normale dei TreeViewItem, eliminando l'ombra, data dal 
-                   multibinding quando sono attivi.-->
+                      multibinding quando sono attivi.-->
                   <HierarchicalDataTemplate.ItemContainerStyle>
                      <Style TargetType="{x:Type TreeViewItem}" >
                         <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersV.xaml
index d3c067d..ffe299d 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersV.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="FixtureParametersV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5">
 
    <StackPanel>
 
       <ListBox Name="FixtureListBox" ItemsSource="{Binding FixtureTypeList}"
-         Height="150" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedFixtureType}">
+               Height="150" IsSynchronizedWithCurrentItem="True" SelectedItem="{Binding SelectedFixtureType}">
          <ListBox.Resources>
             <DataTemplate DataType="{x:Type EgtCAM5:FixtureType}">
                <Grid>
@@ -38,15 +38,15 @@
             </Style>
          </ListBox.ItemContainerStyle>
       </ListBox>
-      
+
       <TextBlock Text="{Binding FixtureErrorMsg,Mode=OneWay}" Margin="5,5,5,5"
-         Style="{StaticResource ValidationErrorTextBlock}"/>
-      
+                 Style="{StaticResource ValidationErrorTextBlock}"/>
+
       <UniformGrid Columns="2">
          <Button Content="Add" Height="30" Command="{Binding AddCommand}" CommandParameter="{Binding Path=SelectedItem, ElementName=FixtureListBox}"/>
          <Button Content="Remove" Height="30" Command="{Binding RemoveCommand}" CommandParameter="{Binding Path=SelectedItem, ElementName=FixtureListBox}"/>
       </UniformGrid>
-      
+
    </StackPanel>
-   
+
 </UserControl>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb
index a748c11..c88c67d 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/RawPartOption/RawPartOptionVM.vb
@@ -1,5 +1,4 @@
-Imports System.ComponentModel
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class RawPartOptionVM
    Inherits ViewModelBase
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 271bc0f..585d5c1 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -5,7 +5,7 @@
 
    <UserControl.Resources>
       <EgtCAM5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-    </UserControl.Resources>
+   </UserControl.Resources>
 
    <StackPanel>
       <ContentControl Content="{Binding Path=ParamExpanderPageV}" />
@@ -27,6 +27,7 @@
                    Style="{StaticResource ViewTool_CheckBox}"/>
 
          <Slider Grid.Row="1" 
+                 Name="SliderV"
                  Value="{Binding SliderValue}"
                  IsEnabled="{Binding IsChecked, ElementName=ViewToolBtn}"
                  TickFrequency="{Binding SliderTick}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml.vb
index 5b63919..6648511 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml.vb
@@ -1,83 +1,19 @@
-Imports EgtWPFLib5
-Imports EgtWPFLib5.EgtFloating
+Public Class MachiningParameterExpanderV
 
-Public Class MachiningParameterExpanderV
+   Private WithEvents m_MachiningParameterExpanderVM As MachiningParameterExpanderVM
 
-   'Private EgtFloatingTray As EgtFloatingTray
-   'Private EgtFloatingPanel As EgtFloatingPanel
+   Sub New()
 
-   'Private m_bFirst As Boolean = True
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
 
-   'Private Sub OperationExpanderView_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
-   '   If m_bFirst Then
-   '      EgtFloatingTray = FindAncestor(Of EgtFloatingTray)(Me)
-   '      EgtFloatingPanel = FindAncestor(Of EgtFloatingPanel)(Me)
-   '      AddHandler EgtFloatingTray.SizeChanged, AddressOf EgtFloatingTray_SizeChanged
-   '      PanelHeight = EgtFloatingPanel.ActualHeight
-   '      Me.AutomaticCloseExpanderStackPanelHeight = AutomaticCloseExpanderStackPanel.ActualHeight
-   '      m_bFirst = False
-   '   End If
-   '   CalculateOperationParametersStackPanelMaxHeight()
-   'End Sub
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      Me.DataContext = Map.refMachiningParameterExpanderVM
+      m_MachiningParameterExpanderVM = Map.refMachiningParameterExpanderVM
+   End Sub
 
-   'Dim m_bSizeChanging As Boolean = False
-
-   'Private Sub EgtFloatingTray_SizeChanged(sender As Object, e As System.Windows.SizeChangedEventArgs)
-   '   If m_bSizeChanging Then Return
-   '   m_bSizeChanging = True
-   '   CalculateOperationParametersStackPanelMaxHeight()
-   '   m_bSizeChanging = False
-   'End Sub
-
-   'Dim PanelHeight As Double = 0
-   'Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
-
-   'Private Sub CalculateOperationParametersStackPanelMaxHeight()
-   '   Dim AutomaticCloseExpanderStackPanelHeight As Double = 0
-   '   Dim OpenedExpanderList As New List(Of Boolean)
-   '   For Index = 0 To AutomaticCloseExpanderStackPanel.Children.Count - 1
-   '      If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
-   '         Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
-   '         If IndexedExpander.IsExpanded Then
-   '            OpenedExpanderList.Add(True)
-   '            IndexedExpander.IsExpanded = False
-   '            Dim CurrExpanderContent As FrameworkElement = DirectCast(IndexedExpander.Content, FrameworkElement)
-   '            CurrExpanderContent.Measure(New Size(Double.PositiveInfinity, Double.PositiveInfinity))
-   '            AutomaticCloseExpanderStackPanelHeight -= CurrExpanderContent.DesiredSize.Height
-   '            ' Sottraggo anche i padding
-   '            AutomaticCloseExpanderStackPanelHeight -= (IndexedExpander.Padding.Top + IndexedExpander.Padding.Bottom)
-   '         Else
-   '            OpenedExpanderList.Add(False)
-   '         End If
-   '      Else
-   '         OpenedExpanderList.Add(False)
-   '      End If
-   '   Next
-   '   Dim RemainingHeight As Double = EgtFloatingTray.ActualHeight - PanelHeight
-   '   AutomaticCloseExpanderStackPanel.MaxHeight = Me.AutomaticCloseExpanderStackPanelHeight + RemainingHeight
-   '   For Index = AutomaticCloseExpanderStackPanel.Children.Count - 1 To 0 Step -1
-   '      If TypeOf AutomaticCloseExpanderStackPanel.Children(Index) Is Expander Then
-   '         Dim IndexedExpander As Expander = DirectCast(AutomaticCloseExpanderStackPanel.Children(Index), Expander)
-   '         If OpenedExpanderList(Index) Then
-   '            IndexedExpander.IsExpanded = True
-   '         End If
-   '      End If
-   '   Next
-   '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
+   Private Sub FocusOnSlider() Handles m_MachiningParameterExpanderVM.m_FocusOnSlider
+      Me.SliderV.Focus()
+   End Sub
 
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 2295577..83505b6 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -1,11 +1,11 @@
-Imports System.ComponentModel
-Imports System.Collections.ObjectModel
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class MachiningParameterExpanderVM
    Inherits VMBase
 
+   Friend Event m_FocusOnSlider()
+
    Private WithEvents m_CurrOperation As MachiningTreeViewItem
    Public Property CurrOperation As MachiningTreeViewItem
       Get
@@ -69,7 +69,7 @@ Public Class MachiningParameterExpanderVM
    End Property
    Friend Sub SetViewTool(value As Boolean)
       ViewTool = value
-      NotifyPropertyChanged("ViewTool")
+      NotifyPropertyChanged(NameOf(ViewTool))
    End Sub
 
    ' Slider per muovere l'utensile in aggiunta ai pulsanti indietro e avanti
@@ -260,9 +260,6 @@ Public Class MachiningParameterExpanderVM
                SurfRoughExpanderV.DataContext = m_CurrOperation
                Return SurfRoughExpanderV
          End Select
-
-         'MachiningParameterExpanderItem.ReadOperationParam()
-
          Return Nothing
       End Get
    End Property
@@ -305,11 +302,21 @@ Public Class MachiningParameterExpanderVM
    Sub New()
       EgtWPFLib5.MachiningDbWindowVM.m_sMachineIniPath = IniFile.m_sCurrMachIniFilePath
       Map.SetRefMachiningParameterExpanderVM(Me)
-      NotifyPropertyChanged("ParamExpanderPageV")
+      NotifyPropertyChanged(NameOf(ParamExpanderPageV))
    End Sub
 
 #End Region    ' Constructor
 
+#Region "METHODS"
+
+   Public Sub FocusSlider()
+      RaiseEvent m_FocusOnSlider()
+      'Dim m_MachiningParameterExpanderV = DirectCast(Map.refOperationParametersExpanderVM.OperationParameters, MachiningParameterExpanderV)
+      'm_MachiningParameterExpanderV.SliderV.Focus()
+   End Sub
+
+#End Region    ' Methods
+
 #Region "COMMANDS"
 
 #Region "UpdateMachiningCommand"
@@ -445,67 +452,16 @@ Public Class MachiningParameterExpanderVM
 
    Private Sub IsModified(IsModified As Boolean) Handles m_CurrOperation.m_IsModified
       m_CurrOperation_IsModified = IsModified
-      ' NotifyPropertyChanged("CurrOperation_IsModified")
-      NotifyPropertyChanged("UpdateMachiningBtn_Background")
+      NotifyPropertyChanged(NameOf(UpdateMachiningBtn_Background))
    End Sub
 
    Private Sub ErrorOnOperation(ErrorOnOperation As Boolean) Handles m_CurrOperation.m_ErrorOnOperation
       m_CurrOperation_ErrorOnOperation = ErrorOnOperation
-      ' NotifyPropertyChanged("CurrOperation_ErrorOnOperation")
-      NotifyPropertyChanged("UpdateMachiningBtn_Background")
+      NotifyPropertyChanged(NameOf(UpdateMachiningBtn_Background))
    End Sub
 
 End Class
 
-'''' <summary>
-'''' Class that represent a Converter that use machining type and param type, to set the visibility state of the param type.
-'''' </summary>
-'Public Class OperationParamVisibilityConverter
-'   Implements IValueConverter
-
-'   Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
-'      Select Case CInt(value)
-'         Case MCH_OY.NONE
-'            Return Visibility.Hidden
-'         Case MCH_OY.DISP
-'            Return TMDbParamVisibility.OperationDisposition(CInt(parameter))
-'         Case MCH_OY.DRILLING
-'            Return TMDbParamVisibility.Drilling(CInt(parameter))
-'         Case MCH_OY.SAWING
-'            Return TMDbParamVisibility.Sawing(CInt(parameter))
-'         Case MCH_OY.MILLING
-'            Return TMDbParamVisibility.Milling(CInt(parameter))
-'         Case MCH_OY.POCKETING
-'            Return TMDbParamVisibility.Pocketing(CInt(parameter))
-'         Case MCH_OY.MORTISING
-'            Return TMDbParamVisibility.Mortising(CInt(parameter))
-'         Case MCH_OY.SAWROUGHING
-'            Return TMDbParamVisibility.Sawroughing(CInt(parameter))
-'         Case MCH_OY.SAWFINISHING
-'            Return TMDbParamVisibility.Sawfinishing(CInt(parameter))
-'         Case MCH_OY.GENMACHINING
-'            Return TMDbParamVisibility.GenMachining(CInt(parameter))
-'         Case MCH_OY.CHISELING
-'            Return TMDbParamVisibility.Chiseling(CInt(parameter))
-'         Case MCH_OY.SURFFINISHING
-'            Return TMDbParamVisibility.SurfFinishing(CInt(parameter))
-'         Case MCH_OY.SURFROUGHING
-'            Return TMDbParamVisibility.SurfRoughing(CInt(parameter))
-'         Case MCH_OY.WATERJETTING
-'            Return TMDbParamVisibility.WaterJetting(CInt(parameter))
-'         Case MCH_OY.FIVEAXISMILLING
-'            Return TMDbParamVisibility.FiveAxMachining(CInt(parameter))
-'         Case Else
-'            Return Visibility.Hidden
-'      End Select
-'   End Function
-
-'   Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
-'      Throw New NotImplementedException
-'   End Function
-
-'End Class
-
 ''' <summary>
 ''' Class that represent a Converter that convert mm in inch if necessary for the param depth.
 ''' </summary>
diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
index f1f0315..4dfc1d0 100644
--- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderVM.vb
@@ -1,7 +1,4 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib5
+Imports EgtUILib
 
 Public Class OperationParametersExpanderVM
    Inherits ViewModelBase
@@ -13,7 +10,7 @@ Public Class OperationParametersExpanderVM
       End Get
       Set(value As Boolean)
          m_OperParamsViewIsEnabled = value
-         OnPropertyChanged("OperParamsViewIsEnabled")
+         OnPropertyChanged(NameOf(OperParamsViewIsEnabled))
       End Set
    End Property
 
@@ -48,7 +45,7 @@ Public Class OperationParametersExpanderVM
          If value <> m_ParametersExpanderName Then
             m_ParametersExpanderName = value
          End If
-         OnPropertyChanged("ParametersExpanderName")
+         OnPropertyChanged(NameOf(ParametersExpanderName))
       End Set
    End Property
 
@@ -64,13 +61,14 @@ Public Class OperationParametersExpanderVM
          Next
          If selOperation.m_Type = MCH_OY.DISP Then
             If IsNothing(m_DispositionParameterExpander) Then
-               m_DispositionParameterExpander = New DispositionParameterExpanderV
-               m_DispositionParameterExpander.DataContext = New DispositionParameterExpanderVM(m_OpenDispositionFunction)
+               m_DispositionParameterExpander = New DispositionParameterExpanderV With {
+                  .DataContext = New DispositionParameterExpanderVM(m_OpenDispositionFunction)
+               }
             End If
             Return m_DispositionParameterExpander
          Else
             If IsNothing(m_MachiningParameterExpander) Then
-               m_MachiningParameterExpander = New MachiningParameterExpanderV
+               m_MachiningParameterExpander = New MachiningParameterExpanderV()
                m_MachiningParameterExpanderVM = New MachiningParameterExpanderVM()
                m_MachiningParameterExpander.DataContext = m_MachiningParameterExpanderVM
             End If
@@ -180,7 +178,7 @@ Public Class OperationParametersExpanderVM
          ' Imposto visualizzazione utensile
          Map.refMachiningParameterExpanderVM.SetViewTool( True)
       End If
-      OnPropertyChanged("ParametersIsExpanded")
+      OnPropertyChanged(NameOf(ParametersIsExpanded))
       Return True
    End Function
 
@@ -215,7 +213,7 @@ Public Class OperationParametersExpanderVM
       Map.refProjectVM.SceneSelType = SceneSelTypeOpt.NULL
       ' Resetto il tipo di selezione
       Map.refProjectVM.SceneSelMode = SceneSelModeOpt.NULL
-      OnPropertyChanged("ParametersIsExpanded")
+      OnPropertyChanged(NameOf(ParametersIsExpanded))
       Return True
    End Function
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
index a34b3c9..9e5e083 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderV.xaml
@@ -1,10 +1,7 @@
 <UserControl x:Class="OperationsListExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   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:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtCAM5="clr-namespace:EgtCAM5">
 
    <StackPanel Name="OperationsListExpanderViewStackPanel" IsEnabled="{Binding OpersListViewIsEnabled}">
 
@@ -27,19 +24,13 @@
                   <DataTemplate DataType="{x:Type EgtCAM5:MachiningOpListBoxItem}">
                      <DataTemplate.Resources>
                         <Style x:Key="LayoutRoot" TargetType="Grid">
-                           <!--<Style.Triggers>
-                              --><!--these are the triggers that make the code cursor jump from box 1 to box 2 to box 3.--><!--
-                              <DataTrigger Binding="{Binding ElementName=Box, Path=Visibility}" Value="Visible">
-                                 <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=Box}"/>
-                              </DataTrigger>
-                           </Style.Triggers>-->
                         </Style>
                      </DataTemplate.Resources>
                      <Border Background="Transparent">
                         <Border.InputBindings>
                            <MouseBinding MouseAction="LeftDoubleClick"
-                                      Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
-                                      CommandParameter="{Binding Id}"/>
+                                         Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
+                                         CommandParameter="{Binding Id}"/>
                         </Border.InputBindings>
                         <Grid Style="{StaticResource LayoutRoot}">
                            <Grid.ColumnDefinitions>
@@ -56,8 +47,6 @@
                                     Width="150"
                                     x:Name="Box"
                                     Visibility="{Binding ModifyName_Visibility}" Margin="0,0,5,0">
-                              <!--IsVisibleChanged="MachiningOpListBoxItem_IsVisibleChanged"
-                                    LostKeyboardFocus="MachiningOpListBoxItem_LostKeyboardFocus">-->
                               <TextBox.InputBindings>
                                  <KeyBinding Key="Enter" Command="{Binding ModifyNameEnterCommand}"/>
                                  <KeyBinding Key="Escape" Command="{Binding ModifyNameEscCommand}"/>
@@ -71,14 +60,14 @@
                      <Border CornerRadius="1" Background="{StaticResource EgaltechBlue3}">
                         <Border.InputBindings>
                            <MouseBinding MouseAction="LeftDoubleClick"
-                                      Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
-                                      CommandParameter="{Binding Id}"/>
+                                         Command="{Binding DataContext.OperationListDoubleClickCommand, RelativeSource={RelativeSource AncestorType={x:Type EgtCAM5:OperationsListExpanderV}}}"
+                                         CommandParameter="{Binding Id}"/>
                         </Border.InputBindings>
                         <StackPanel Orientation="Horizontal">
                            <CheckBox IsChecked="{Binding StatusAll}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                            <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
                            <TextBlock Text="{Binding Name}" Foreground="White"
-                        FontSize="15" FontWeight="SemiBold"/>
+                                      FontSize="15" FontWeight="SemiBold"/>
                         </StackPanel>
                      </Border>
                   </DataTemplate>
@@ -88,14 +77,6 @@
                      <StackPanel Orientation="Vertical"/>
                   </ItemsPanelTemplate>
                </ListBox.ItemsPanel>
-               <!--<Interactivity:Interaction.Triggers>
-                  <Interactivity:EventTrigger EventName="MouseDoubleClick">
-                     <Interactivity:InvokeCommandAction Command="{Binding OperationListDoubleClickCommand}"/>
-                  </Interactivity:EventTrigger>
-               </Interactivity:Interaction.Triggers>-->
-               <!--<Interactivity:Interaction.Behaviors>
-                  <EgtCAM5:ScrollIntoViewForListBox/>
-               </Interactivity:Interaction.Behaviors>-->
                <ListBox.InputBindings>
                   <KeyBinding Key="Delete" Command="{Binding CancelOperationCommand}"/>
                </ListBox.InputBindings>
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
index 95d298f..604457c 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
@@ -30,19 +30,11 @@ Public Class OperationsListExpanderVM
    End Sub
 
    Private Sub EndNewMachining(SelOpId As Integer)
-      '' Deseleziono eventuali geometrie selezionate
-      'EgtDeselectAll()
-      'EgtDraw()
       ' Sblocco la lista operazioni
       IsEnabledOperationList = True
       ' Disabilito e chiudo l'expander con l'albero delle lavorazioni
       Map.refMachiningTreeExpanderVM.CodeCommand = True
       Map.refMachiningTreeExpanderVM.IsEnabled = False
-      '' Disabilito la selezione
-      'Map.refProjectVM.SceneSelType = SceneSelTypeOpt.NULL)
-      '' Disabilito la selezione di curve e superfici del pezzo
-      'Map.refProjectVM.SceneSelMode = SceneSelModeOpt.NULL)
-
       ' Apro i parametri della lavorazione aggiunta
       Map.refOperationParametersExpanderVM.ParametersIsExpanded = True
       m_NewMachining = False
@@ -72,7 +64,7 @@ Public Class OperationsListExpanderVM
       End Get
       Set(value As Boolean)
          m_OpersListViewIsEnabled = value
-         OnPropertyChanged("OpersListViewIsEnabled")
+         OnPropertyChanged(NameOf(OpersListViewIsEnabled))
       End Set
    End Property
 
@@ -96,7 +88,7 @@ Public Class OperationsListExpanderVM
       Set(value As Boolean)
          If value <> m_IsEnabledOperationList Then
             m_IsEnabledOperationList = value
-            OnPropertyChanged("IsEnabledOperationList")
+            OnPropertyChanged(NameOf(IsEnabledOperationList))
          End If
       End Set
    End Property
@@ -385,8 +377,6 @@ Public Class OperationsListExpanderVM
                   ' Posso cancellare solo l'ultima disposizione
                   If EgtGetOperationPhase(Operation.Id) = EgtGetPhaseCount() Then
                      EgtRemoveLastPhase()
-                     'Else
-                     '   Return
                   End If
                Else
                   ' Deseleziono la geometria selezionata
@@ -486,8 +476,8 @@ Public Class OperationsListExpanderVM
             EgtSetCurrMachining( PreviousId)
             EgtApplyMachining( False)
             EgtDraw()
-            OnPropertyChanged( "MoveUp_IsEnabled")
-            OnPropertyChanged( "MoveDown_IsEnabled")
+            OnPropertyChanged(NameOf(MoveUp_IsEnabled))
+            OnPropertyChanged(NameOf(MoveDown_IsEnabled))
             Map.refProjectVM.EmitTitle()
          Else
             Dim nCurrPhase As Integer = EgtGetOperationPhase(LastSelectedId)
@@ -561,8 +551,8 @@ Public Class OperationsListExpanderVM
                EgtApplyMachining( False)
             Next
             EgtDraw()
-            OnPropertyChanged( "MoveUp_IsEnabled")
-            OnPropertyChanged( "MoveDown_IsEnabled")
+            OnPropertyChanged(NameOf(MoveUp_IsEnabled))
+            OnPropertyChanged(NameOf(MoveDown_IsEnabled))
             Map.refProjectVM.EmitTitle()
          Else
             If EgtGetOperationType( NextId) <> MCH_OY.DISP Then
@@ -929,36 +919,8 @@ Public Class OperationsListExpanderVM
       Dim SelectedOperation As MachiningOpListBoxItem = TryCast(selOperation, MachiningOpListBoxItem)
       If IsNothing(SelectedOperation) Then Return
       SelectedOperation.IsActive_ModifyName = True
-      ' apro la finetra che chiede il nome e verifica che non sia già utilizzato
-      'Dim NewName As String = m_SelectedOperation.Name
-      'Dim NameDialogVM As New EgtWPFLib5.NameDialogVM With {
-      '   .Title = "Nome lavorazione in Db",
-      '   .Name = m_SelectedOperation.Name,
-      '   .NameVerifyer = AddressOf NameVerifyer}
-      'Dim NameWnd As New EgtWPFLib5.NameDialogV(Application.Current.MainWindow, NameDialogVM)
-      'If Not NameWnd.ShowDialog() Then Return
-      '' creo lavorazione nel Db
-      'EgtMdbAddMachining(NameDialogVM.Name, m_SelectedOperation.m_Type)
    End Sub
 
-   '' verifico che il nome non sia già utilizzato
-   'Private Function NameVerifyer(Name As String) As Boolean
-   '   If String.IsNullOrWhiteSpace(Name) Then
-   '      MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8),
-   '                      EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
-   '                      MessageBoxButton.OK, MessageBoxImage.Error)
-   '      Return False
-   '   End If
-   '   Dim TempName As String = Name
-   '   'EgtGetMachiningNewName(TempName)
-   '   If String.Compare(TempName, Name, True) = 0 Then Return True
-   '   MessageBox.Show(Name & " " &
-   '                   EgtMsg(MSG_EGTSAVEFILEDIALOG + 3),
-   '                   EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
-   '                   MessageBoxButton.OK, MessageBoxImage.Error)
-   '   Return False
-   'End Function
-
 #End Region ' RenameCommand
 
 #End Region     ' Commands
@@ -972,7 +934,7 @@ Public Class OperationsListExpanderVM
       Map.refProjectVM.SceneSelType = SceneSelTypeOpt.MACHPATH
       ' Abilito la selezione di tutti i tipi di geometria
       Map.refProjectVM.SceneSelMode = SceneSelModeOpt.ALL
-      OnPropertyChanged("ListIsExpanded")
+      OnPropertyChanged(NameOf(ListIsExpanded))
       Map.refMachinePanelVM.ToolMachSetUpIsEnabled(True, True, True)
       If Not IsNothing(Map.refDoorPanelVM) Then Map.refDoorPanelVM.MTableIsEnabled(True)
       If Not IsNothing(Map.refSpecialPanelVM) Then Map.refSpecialPanelVM.SpecialPanelIsEnabled(True)
@@ -982,7 +944,7 @@ Public Class OperationsListExpanderVM
    Friend Function ExitOperationsList() As Boolean
       m_ListIsExpanded = False
 
-      OnPropertyChanged("ListIsExpanded")
+      OnPropertyChanged(NameOf(ListIsExpanded))
       Return True
    End Function
 
@@ -1163,29 +1125,14 @@ Public Class OperationsListExpanderVM
       For Index = 0 To OperationList.Count - 1
          If OperationList(Index).IsSelected Then
             OperationList(Index).IsSelected = False
-            'OperationList(Index).NotifyPropertyChanged("IsSelected")
-            'Exit For
          End If
       Next
       ' Ora cerco l'Operazione tramite nId e la seleziono
       Dim nOpId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nId)))
-      'Dim i As Integer = 0
-      'For Each Item In OperationList
-      '   Dim nOpType As Integer = EgtGetOperationType(nOpId)
-      '   If Item.Id = nOpId And nOpType <> MCH_OY.NONE And nOpType <> MCH_OY.DISP Then
-      '      '(OperationListBoxItem)OperationList.Where(Function(x) x.Id = nOpId).IsSelected = True
-      '      OperationList(i).IsSelected = True
-      '      'Item.IsSelected = True
-      '      'Item.NotifyPropertyChanged("IsSelected")
-      '      Exit For
-      '   End If
-      '   i = i + 1
-      'Next
       For Index = 0 To OperationList.Count - 1
          Dim nOpType As Integer = EgtGetOperationType(nOpId)
          If OperationList(Index).Id = nOpId And nOpType <> MCH_OY.NONE And nOpType <> MCH_OY.DISP Then
             OperationList(Index).IsSelected = True
-            'OperationList(Index).NotifyPropertyChanged("IsSelected")
             Exit For
          End If
       Next
diff --git a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml
index 6cb136d..9081fff 100644
--- a/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderV.xaml
@@ -1,107 +1,106 @@
 <UserControl x:Class="SimulationExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-   
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+
    <StackPanel>
-        <Expander Header="{Binding SimulationMsg}" 
-                  IsExpanded="{Binding Simulation_IsExpanded}" 
-                  IsEnabled="{Binding Simulation_IsEnabled}" 
-                  Style="{StaticResource ExpanderStyle}">
-            <StackPanel>
+      <Expander Header="{Binding SimulationMsg}" 
+                IsExpanded="{Binding Simulation_IsExpanded}" 
+                IsEnabled="{Binding Simulation_IsEnabled}" 
+                Style="{StaticResource ExpanderStyle}">
+         <StackPanel>
 
-                <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}"
-                  ToolTip="{Binding OneStepToolTip}">
-                        <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/PlayStep.png"
+               <Button Command="{Binding StepCommand}" Grid.Column="0" Grid.Row="3"
+                       Style="{StaticResource EgtCAM5_SimulationButton}"
+                       ToolTip="{Binding OneStepToolTip}">
+                  <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/PlayStep.png"
                          HorizontalAlignment="Center" VerticalAlignment="Center"
                          Height="50" Width="50"/>
-                    </Button>
+               </Button>
 
-                    <Button Command="{Binding PlayPauseCommand}" Grid.Column="1" Grid.Row="3"
-                  Style="{StaticResource EgtCAM5_SimulationButton}"
-                  ToolTip="{Binding PlayPauseToolTip}">
-                        <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}"
+                       ToolTip="{Binding PlayPauseToolTip}">
+                  <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}"
-                  ToolTip="{Binding StopHomeToolTip}">
-                        <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/Stop.png"
+               <Button Command="{Binding StopCommand}" Grid.Column="2" Grid.Row="3"
+                       Style="{StaticResource EgtCAM5_SimulationButton}"
+                       ToolTip="{Binding StopHomeToolTip}">
+                  <Image Source="/Resources/OptionPanel/MachiningOptionPanel/SimulationExpander/Stop.png"
                          HorizontalAlignment="Center" VerticalAlignment="Center"
                          Height="50" Width="50"/>
-                    </Button>
+               </Button>
 
-                </UniformGrid>
+            </UniformGrid>
 
-                <TextBlock Text="{Binding StatusMsg}" FontSize="15" TextAlignment="Center" Margin="10,5,10,0"/>
+            <TextBlock Text="{Binding StatusMsg}" FontSize="15" TextAlignment="Center" Margin="10,5,10,0"/>
 
-                <Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="30"
+            <Slider Name="SpeedSlider" Grid.Row="5" Grid.ColumnSpan="3" Height="30"
                     Minimum="1"  Maximum="100" TickPlacement="BottomRight" TickFrequency="10"
                     Margin="10,5,10,0" Value="{Binding SliderValue}"/>
 
-                <StackPanel Orientation="Horizontal" Visibility="{Binding VMill_Visibility}"
+            <StackPanel Orientation="Horizontal" Visibility="{Binding VMill_Visibility}"
                         IsEnabled="{Binding VMill_IsEnabled}" Margin="10,5,10,0">
-                    <CheckBox HorizontalAlignment="Left" VerticalAlignment="Center"
-                  IsChecked="{Binding VMillActive}"/>
-                    <TextBlock Text="{Binding VMillMsg}" Margin="5,0,0,0"/>
-                </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*"/>
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Text="{Binding OpeName}" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="3" />
-                    <TextBlock Text="{Binding TName}" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" TextAlignment="Center" Margin="5,1,5,0" Grid.ColumnSpan="2" />
-                    <TextBlock Text="{Binding SValue}" Grid.Row="1" Grid.Column="2"  FontSize="15" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" TextAlignment="Right" Margin="0,1,5,0" />
-                    <TextBlock Text="{Binding GCode}" Grid.Row="2"  FontSize="15" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" TextAlignment="Center" Margin="5,1,5,0" Grid.ColumnSpan="2" />
-                    <TextBlock Text="{Binding FValue}" Grid.Row="2"  Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
-                     VerticalAlignment="Center" TextAlignment="Right" Margin="0,1,5,0" />
-                </Grid>
-
-                <ItemsControl Grid.Row="10" Margin="0,5,0,5" ItemsSource="{Binding MachineAxisList}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <Grid Margin="5,1,10,1">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="2*"/>
-                                </Grid.ColumnDefinitions>
-
-                                <TextBlock Text="{Binding Token}" FontSize="15"
-                              HorizontalAlignment="Center" VerticalAlignment="Center"
-                              TextWrapping="Wrap" TextAlignment="Center"/>
-                                <EgtWPFLib5:EgtTextBox Text="{Binding Value, UpdateSourceTrigger=Explicit}" Grid.Column="1"
-                                                        ExplicitUpdateSource="EnterKeyPress"
-                                                        IsReadOnly="{Binding IsReadOnlyAxesValue}"
-                                                        IsEnabled="{Binding IsEnabledAxesValue}"
-                                                        TextAlignment="Right">
-                                </EgtWPFLib5:EgtTextBox>
-
-                            </Grid>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-
+               <CheckBox HorizontalAlignment="Left" VerticalAlignment="Center"
+                         IsChecked="{Binding VMillActive}"/>
+               <TextBlock Text="{Binding VMillMsg}" Margin="5,0,0,0"/>
             </StackPanel>
-        </Expander>
 
-    </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*"/>
+               </Grid.RowDefinitions>
+
+               <TextBlock Text="{Binding OpeName}" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
+                          VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="3" />
+               <TextBlock Text="{Binding TName}" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
+                          VerticalAlignment="Center" TextAlignment="Center" Margin="5,1,5,0" Grid.ColumnSpan="2" />
+               <TextBlock Text="{Binding SValue}" Grid.Row="1" Grid.Column="2"  FontSize="15" HorizontalAlignment="Center"
+                          VerticalAlignment="Center" TextAlignment="Right" Margin="0,1,5,0" />
+               <TextBlock Text="{Binding GCode}" Grid.Row="2"  FontSize="15" HorizontalAlignment="Center"
+                          VerticalAlignment="Center" TextAlignment="Center" Margin="5,1,5,0" Grid.ColumnSpan="2" />
+               <TextBlock Text="{Binding FValue}" Grid.Row="2"  Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
+                          VerticalAlignment="Center" TextAlignment="Right" Margin="0,1,5,0" />
+            </Grid>
+
+            <ItemsControl Grid.Row="10" Margin="0,5,0,5" ItemsSource="{Binding MachineAxisList}">
+               <ItemsControl.ItemTemplate>
+                  <DataTemplate>
+                     <Grid Margin="5,1,10,1">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="2*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Text="{Binding Token}" FontSize="15"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                                   TextWrapping="Wrap" TextAlignment="Center"/>
+                        <EgtWPFLib5:EgtTextBox Text="{Binding Value, UpdateSourceTrigger=Explicit}" Grid.Column="1"
+                                               ExplicitUpdateSource="EnterKeyPress"
+                                               IsReadOnly="{Binding IsReadOnlyAxesValue}"
+                                               IsEnabled="{Binding IsEnabledAxesValue}"
+                                               TextAlignment="Right">
+                        </EgtWPFLib5:EgtTextBox>
+
+                     </Grid>
+                  </DataTemplate>
+               </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+         </StackPanel>
+      </Expander>
+
+   </StackPanel>
 
 </UserControl>
diff --git a/OptionPanel/MachiningOptionPanelVM.vb b/OptionPanel/MachiningOptionPanelVM.vb
index 6c2889d..48ea62f 100644
--- a/OptionPanel/MachiningOptionPanelVM.vb
+++ b/OptionPanel/MachiningOptionPanelVM.vb
@@ -31,8 +31,9 @@ Public Class MachiningOptionPanelVM
    Public ReadOnly Property MachiningsTreeExpander As ContentControl
       Get
          If IsNothing(m_MachiningsTreeExpander) Then
-            m_MachiningsTreeExpander = New MachiningTreeExpanderV
-            m_MachiningsTreeExpander.DataContext = New MachiningTreeExpanderVM
+            m_MachiningsTreeExpander = New MachiningTreeExpanderV With {
+               .DataContext = New MachiningTreeExpanderVM
+            }
          End If
          Return m_MachiningsTreeExpander
       End Get
@@ -42,8 +43,9 @@ Public Class MachiningOptionPanelVM
    Public ReadOnly Property SimulationExpander As ContentControl
       Get
          If IsNothing(m_SimulationExpander) Then
-            m_SimulationExpander = New SimulationExpanderV
-            m_SimulationExpander.DataContext = New SimulationExpanderVM
+            m_SimulationExpander = New SimulationExpanderV With {
+               .DataContext = New SimulationExpanderVM
+            }
          End If
          Map.refSimulationExpanderVM.Simulation_IsEnabled = True
          Return m_SimulationExpander
@@ -54,8 +56,9 @@ Public Class MachiningOptionPanelVM
    Public ReadOnly Property EstimationsExpander As ContentControl
       Get
          If IsNothing(m_EstimationsExpander) Then
-            m_EstimationsExpander = New EstimationsExpanderV
-            m_EstimationsExpander.DataContext = New EstimationsExpanderVM
+            m_EstimationsExpander = New EstimationsExpanderV With {
+               .DataContext = New EstimationsExpanderVM
+            }
          End If
          Map.refEstimationsExpanderVM.Estimation_IsEnabled =
                        (EgtUILib.GetPrivateProfileInt(S_ESTIMATIONS, K_EST_ENABLE, 0, IniFile.m_sCurrMachIniFilePath) <> 0)
@@ -121,7 +124,7 @@ Public Class MachiningOptionPanelVM
                Case MachiningOptionPanelExpander.ESTIMATIONS
                   Map.refEstimationsExpanderVM.InitEstimations()
             End Select
-            OnPropertyChanged("OpenExpander")
+            OnPropertyChanged(NameOf(OpenExpander))
          End If
       End Set
    End Property
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 11fb61a..395a013 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -1320,6 +1320,21 @@ Public Class ProjectVM
          If Not EgtIsSelectedObj(nId) Then m_Controller.MouseSelectedObj(nId, bLast)
       Else
          m_Controller.MouseSelectedObj(nId, bLast)
+         ' Recupero primo layer selezionato
+         Dim nFirstSelId As Integer = EgtGetFirstSelectedObj()
+         ' Se viene selezionato un layer diverso deseleziono il layer precedente
+         If nFirstSelId <> nId Then
+            SetLastInteger(nFirstSelId)
+            Map.refProjectVM.ExecuteCommand(Controller.CMD.DESELECTPARTLAYEROBJ)
+         End If
+         ' Selezione layer in albero
+         Map.refManageLayerExpanderVM.UpdateObjInObjTree(nId)
+         Map.refManageLayerExpanderVM.SelectIdInObjTree(nId)
+         Map.refManageLayerExpanderVM.UpdateObjTree()
+         ' Cancello geometria e info di eventuale precedente analisi
+         Analyze.ClearAnalyzeGroup()
+         Map.refStatusBarVM.NotifyStatusOutput("")
+         EgtDraw()
       End If
    End Sub
 
diff --git a/SetUp/SetUpVM.vb b/SetUp/SetUpVM.vb
index fd10af7..c37a141 100644
--- a/SetUp/SetUpVM.vb
+++ b/SetUp/SetUpVM.vb
@@ -1,8 +1,6 @@
 Imports System.Collections.ObjectModel
-Imports System.ComponentModel
 Imports System.IO
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class SetUpVM
    Inherits VMBase
diff --git a/StatusBar/StatusBarV.xaml b/StatusBar/StatusBarV.xaml
index 6c32863..371a35b 100644
--- a/StatusBar/StatusBarV.xaml
+++ b/StatusBar/StatusBarV.xaml
@@ -1,12 +1,11 @@
 <UserControl x:Class="StatusBarV"
-   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:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="20" d:DesignWidth="1366">
+            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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+            mc:Ignorable="d" 
+            d:DesignHeight="20" d:DesignWidth="1366">
 
    <!--StatusBar che contiene quote, barre di caricamento ed alcune impostazioni-->
    <StatusBar DockPanel.Dock="Bottom" Background="{StaticResource EgaltechBlue1}">
@@ -33,7 +32,7 @@
       </StatusBarItem>
       <StatusBarItem Grid.Column="1">
          <Button Command="{Binding StatusStopCommand}" Content="X"
-            IsEnabled="{Binding StopProgress_IsEnabled}" Width="20"/>
+                 IsEnabled="{Binding StopProgress_IsEnabled}" Width="20"/>
       </StatusBarItem>
       <StatusBarItem Grid.Column="2">
          <StatusBarItem.InputBindings>
diff --git a/ToolsDbWindow/MyToolDbWindowVM.vb b/ToolsDbWindow/MyToolDbWindowVM.vb
index da61c95..2c2e43f 100644
--- a/ToolsDbWindow/MyToolDbWindowVM.vb
+++ b/ToolsDbWindow/MyToolDbWindowVM.vb
@@ -1,7 +1,4 @@
-Imports System.Windows.Forms.Integration
-Imports System.Collections.ObjectModel
-Imports System.Reflection
-Imports System.IO
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5