diff --git a/Application.xaml.vb b/Application.xaml.vb
index ad146d9..20f1143 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -57,9 +57,10 @@ Class Application
    Friend Const ISOVIEWSE As String = "IsoViewSE"
    Friend Const ISOVIEWNE As String = "IsoViewNE"
    Friend Const ISOVIEWNW As String = "IsoViewNW"
-   Friend Const CURVEDIR As String = "CurveDir"
-   Friend Const ANALYZE As String = "Analyze"
-   Friend Const GETDIST As String = "GetDist"
+   Friend Const SETSTATUSANALYZE As String = "SetStatusAnalyze"
+   Friend Const RESETSTATUSANALYZE As String = "ResetStatusAnalyze"
+   Friend Const SETSTATUSGETDISTANCE As String = "SetStatusGetDistance"
+   Friend Const RESETSTATUSGETDISTANCE As String = "ResetStatusGetDistance"
    Friend Const CPLANETOP As String = "CPlaneTop"
    Friend Const CPLANEFRONT As String = "CPlaneFront"
    Friend Const CPLANERIGHT As String = "CPlaneRight"
@@ -133,6 +134,8 @@ Class Application
    Friend Const UPDATEHEADERCOLOR As String = "UpdateHeaderColor"
    Friend Const UPDATEOBJTREEOLDID As String = "UpdateObjTreeOldId"
    Friend Const DRAWOPTIONPANEL_CLOSING As String = "DrawOptionPanel_Closing"
+   Friend Const UPDATEOBJDATAINOBJTREE As String = "UpdateObjDataInObjTree"
+   Friend Const SETINFOBOX As String = "SetInfoBox"
 
    ' StatusBar messages
    Friend Const STATUSGRIDCOMMAND As String = "StatusGridCommand"
diff --git a/ProjectPage/GridViewPanel/GridViewPanelView.xaml b/ProjectPage/GridViewPanel/GridViewPanelView.xaml
index 49cb954..fe8ff64 100644
--- a/ProjectPage/GridViewPanel/GridViewPanelView.xaml
+++ b/ProjectPage/GridViewPanel/GridViewPanelView.xaml
@@ -49,13 +49,13 @@
       <Button ToolTip="{Binding LookFromIso_NWToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding IsoViewNWCommand}">
          <Image Source="/Resources/GridViewPanel/LookFromISO_NW.png" Stretch="Uniform"/>
       </Button>
-      <ToggleButton ToolTip="{Binding CurveDirToolTip}" Style="{StaticResource GridViewPanelToggleButton}" Command="{Binding CurveDirCommand}">
+      <ToggleButton ToolTip="{Binding CurveDirToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding CurveDirIsChecked}">
          <Image Source="/Resources/GridViewPanel/CurveDir.png" Stretch="Uniform"/>
       </ToggleButton>
-      <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" Command="{Binding AnalyzeCommand}">
+      <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}">
          <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
       </ToggleButton>
-      <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" Command="{Binding GetDistCommand}">
+      <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
          <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
       </ToggleButton>
       <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Background="LightGray"/>
diff --git a/ProjectPage/GridViewPanel/GridViewPanelViewModel.vb b/ProjectPage/GridViewPanel/GridViewPanelViewModel.vb
index 500dfda..b21694e 100644
--- a/ProjectPage/GridViewPanel/GridViewPanelViewModel.vb
+++ b/ProjectPage/GridViewPanel/GridViewPanelViewModel.vb
@@ -15,6 +15,60 @@ Namespace EgtCAM5
          End Set
       End Property
 
+      Private m_CurveDirIsChecked As Boolean
+      Public Property CurveDirIsChecked As Boolean
+         Get
+            Return m_CurveDirIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_CurveDirIsChecked Then
+               m_CurveDirIsChecked = value
+               EgtSetShowCurveDirection(value)
+               OnPropertyChanged("CurveDirIsChecked")
+            End If
+         End Set
+      End Property
+
+      Private m_AnalyzeIsChecked As Boolean
+      Public Property AnalyzeIsChecked As Boolean
+         Get
+            Return m_AnalyzeIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_AnalyzeIsChecked Then
+               m_AnalyzeIsChecked = value
+               GetDistIsChecked = False
+               If value Then
+                  Application.Msn.NotifyColleagues(Application.SETSTATUSANALYZE)
+               Else
+                  Application.Msn.NotifyColleagues(Application.RESETSTATUSANALYZE)
+               End If
+               OnPropertyChanged("GetDistIsChecked")
+               OnPropertyChanged("AnalyzeIsChecked")
+            End If
+         End Set
+      End Property
+
+      Private m_GetDistIsChecked As Boolean
+      Public Property GetDistIsChecked As Boolean
+         Get
+            Return m_GetDistIsChecked
+         End Get
+         Set(value As Boolean)
+            If value <> m_GetDistIsChecked Then
+               m_GetDistIsChecked = value
+               AnalyzeIsChecked = False
+               If value Then
+                  Application.Msn.NotifyColleagues(Application.SETSTATUSGETDISTANCE)
+               Else
+                  Application.Msn.NotifyColleagues(Application.RESETSTATUSGETDISTANCE)
+               End If
+               OnPropertyChanged("GetDistIsChecked")
+               OnPropertyChanged("AnalyzeIsChecked")
+            End If
+         End Set
+      End Property
+
       'Proprietà ToolTip
       Public ReadOnly Property RenderingWFToolTip As String
          Get
@@ -686,95 +740,95 @@ Namespace EgtCAM5
 
 #End Region ' IsoViewNWCommand
 
-#Region "CurveDirCommand"
+      '#Region "CurveDirCommand"
 
-      ''' <summary>
-      ''' Returns a command that do CurveDir.
-      ''' </summary>
-      Public ReadOnly Property CurveDirCommand As ICommand
-         Get
-            If m_cmdCurveDir Is Nothing Then
-               m_cmdCurveDir = New RelayCommand(AddressOf CurveDir, AddressOf CanCurveDir)
-            End If
-            Return m_cmdCurveDir
-         End Get
-      End Property
+      '      ''' <summary>
+      '      ''' Returns a command that do CurveDir.
+      '      ''' </summary>
+      '      Public ReadOnly Property CurveDirCommand As ICommand
+      '         Get
+      '            If m_cmdCurveDir Is Nothing Then
+      '               m_cmdCurveDir = New RelayCommand(AddressOf CurveDir, AddressOf CanCurveDir)
+      '            End If
+      '            Return m_cmdCurveDir
+      '         End Get
+      '      End Property
 
-      ''' <summary>
-      ''' Execute the CurveDir.  This method is invoked by the CurveDirCommand.
-      ''' </summary>
-      Public Sub CurveDir(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.CURVEDIR)
-      End Sub
+      '      ''' <summary>
+      '      ''' Execute the CurveDir.  This method is invoked by the CurveDirCommand.
+      '      ''' </summary>
+      '      Public Sub CurveDir(ByVal param As Object)
+      '         Application.Msn.NotifyColleagues(Application.CURVEDIR)
+      '      End Sub
 
-      ''' <summary>
-      ''' Returns always true.
-      ''' </summary>
-      Private Function CanCurveDir(ByVal param As Object) As Boolean
-         Return True
-      End Function
+      '      ''' <summary>
+      '      ''' Returns always true.
+      '      ''' </summary>
+      '      Private Function CanCurveDir(ByVal param As Object) As Boolean
+      '         Return True
+      '      End Function
 
-#End Region ' CurveDirCommand
+      '#End Region ' CurveDirCommand
 
-#Region "AnalyzeCommand"
+      '#Region "AnalyzeCommand"
 
-      ''' <summary>
-      ''' Returns a command that do Analyze.
-      ''' </summary>
-      Public ReadOnly Property AnalyzeCommand As ICommand
-         Get
-            If m_cmdAnalyze Is Nothing Then
-               m_cmdAnalyze = New RelayCommand(AddressOf Analyze, AddressOf CanAnalyze)
-            End If
-            Return m_cmdAnalyze
-         End Get
-      End Property
+      '      ''' <summary>
+      '      ''' Returns a command that do Analyze.
+      '      ''' </summary>
+      '      Public ReadOnly Property AnalyzeCommand As ICommand
+      '         Get
+      '            If m_cmdAnalyze Is Nothing Then
+      '               m_cmdAnalyze = New RelayCommand(AddressOf Analyze, AddressOf CanAnalyze)
+      '            End If
+      '            Return m_cmdAnalyze
+      '         End Get
+      '      End Property
 
-      ''' <summary>
-      ''' Execute the Analyze.  This method is invoked by the AnalyzeCommand.
-      ''' </summary>
-      Public Sub Analyze(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.ANALYZE)
-      End Sub
+      '      ''' <summary>
+      '      ''' Execute the Analyze.  This method is invoked by the AnalyzeCommand.
+      '      ''' </summary>
+      '      Public Sub Analyze(ByVal param As Object)
+      '         Application.Msn.NotifyColleagues(Application.ANALYZE)
+      '      End Sub
 
-      ''' <summary>
-      ''' Returns always true.
-      ''' </summary>
-      Private Function CanAnalyze(ByVal param As Object) As Boolean
-         Return True
-      End Function
+      '      ''' <summary>
+      '      ''' Returns always true.
+      '      ''' </summary>
+      '      Private Function CanAnalyze(ByVal param As Object) As Boolean
+      '         Return True
+      '      End Function
 
-#End Region ' AnalyzeCommand
+      '#End Region ' AnalyzeCommand
 
-#Region "GetDistCommand"
+      '#Region "GetDistCommand"
 
-      ''' <summary>
-      ''' Returns a command that do GetDist.
-      ''' </summary>
-      Public ReadOnly Property GetDistCommand As ICommand
-         Get
-            If m_cmdGetDist Is Nothing Then
-               m_cmdGetDist = New RelayCommand(AddressOf GetDist, AddressOf CanGetDist)
-            End If
-            Return m_cmdGetDist
-         End Get
-      End Property
+      '      ''' <summary>
+      '      ''' Returns a command that do GetDist.
+      '      ''' </summary>
+      '      Public ReadOnly Property GetDistCommand As ICommand
+      '         Get
+      '            If m_cmdGetDist Is Nothing Then
+      '               m_cmdGetDist = New RelayCommand(AddressOf GetDist, AddressOf CanGetDist)
+      '            End If
+      '            Return m_cmdGetDist
+      '         End Get
+      '      End Property
 
-      ''' <summary>
-      ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
-      ''' </summary>
-      Public Sub GetDist(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.GETDIST)
-      End Sub
+      '      ''' <summary>
+      '      ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
+      '      ''' </summary>
+      '      Public Sub GetDist(ByVal param As Object)
+      '         Application.Msn.NotifyColleagues(Application.GETDIST)
+      '      End Sub
 
-      ''' <summary>
-      ''' Returns always true.
-      ''' </summary>
-      Private Function CanGetDist(ByVal param As Object) As Boolean
-         Return True
-      End Function
+      '      ''' <summary>
+      '      ''' Returns always true.
+      '      ''' </summary>
+      '      Private Function CanGetDist(ByVal param As Object) As Boolean
+      '         Return True
+      '      End Function
 
-#End Region ' GetDistCommand
+      '#End Region ' GetDistCommand
 
 #Region "CPlaneTopCommand"
 
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
index ede5488..570287b 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EgtCAM5.EgtCAM5">
 
-   <Expander Header="Properties" IsExpanded="{Binding IsEnabled}">
+   <Expander Header="Properties" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}">
       <UniformGrid>
          <TextBox Text="{Binding InfoBox}"/>
       </UniformGrid>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb
index 42c2c5c..5c24d6a 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderViewModel.vb
@@ -26,11 +26,25 @@ Namespace EgtCAM5
          Set(value As String)
             If value <> m_InfoBox Then
                m_InfoBox = value
+               If value <> String.Empty Then
+                  IsEnabled = True
+               Else
+                  IsEnabled = False
+               End If
                OnPropertyChanged("InfoBox")
             End If
          End Set
       End Property
 
+      Sub New()
+         Application.Msn.Register(Application.UPDATEOBJDATAINOBJTREE, Sub(Id As Integer)
+                                                                         UpdateObjDataInObjTree(Id)
+                                                                      End Sub)
+         Application.Msn.Register(Application.SETINFOBOX, Sub(sString As String)
+                                                             InfoBox = sString
+                                                          End Sub)
+      End Sub
+
       Private Sub UpdateObjDataInObjTree(ByVal nId As Integer)
          ' recupero il tipo del nuovo oggetto
          Dim nType As Integer = EgtGetType(nId)
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
index e3d63eb..a3f2ea2 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
@@ -2,10 +2,10 @@
    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 }" Grid.Row="2">
+   <Expander Header="{Binding Title}" IsExpanded="{Binding IsExpanded}" IsEnabled="{Binding IsEnabled}">
       <StackPanel>
          <StackPanel.Style>
-            <Style>
+            <Style TargetType="{x:Type StackPanel}">
                <Style.Triggers>
                   <DataTrigger Binding="{Binding FocusTextBox}" Value="True">
                      <Setter Property="FocusManager.FocusedElement" Value="{Binding ElementName=PropertySearch}"/>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
index c92100b..76383a5 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
@@ -18,7 +18,7 @@
             <Button Content="New Layer" Command="{Binding NewLayerCommand}"  Height="40"/>
             <Button Content="Color" Command="{Binding LayerColorCommand}"  Height="40"/>
          </UniformGrid>
-         <TreeView Name="LayerTreeView" MaxHeight="400" 
+         <TreeView Name="LayerTreeView" MinHeight="150" MaxHeight="400" 
             ItemsSource="{Binding Path=LayerList}">
             <interactivity:Interaction.Triggers>
                <interactivity:EventTrigger EventName="MouseDoubleClick">
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
index 1a4392c..2e12a4b 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
@@ -54,6 +54,8 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
+         'Imposto tempo di evidenziazione delle entità clickate
+         ObjTreeTimer.Interval = New TimeSpan(0, 0, 1)
          Application.Msn.Register(Application.LOADOBJTREE, Sub()
                                                               LoadObjTree()
                                                            End Sub)
@@ -228,9 +230,9 @@ Namespace EgtCAM5
          AddGroupInObjTree(GDB_ID.ROOT, GDB_LV.USER, 0, LayerList)
          If nOldId <> GDB_ID.NULL Then
             SelectIdInObjTree(nOldId)
-            'UpdateObjDataInObjTree(m_nObjTreeOldId)
+            Application.Msn.NotifyColleagues(Application.UPDATEOBJDATAINOBJTREE, m_nObjTreeOldId)
          Else
-            'tBoxInfo.Text = String.Empty
+            Application.Msn.NotifyColleagues(Application.SETINFOBOX, String.Empty)
          End If
       End Sub
 
@@ -374,7 +376,7 @@ Namespace EgtCAM5
          ' per aggiornare l'albero senza ricostruirlo da capo
          ' se c'è una entità corrente, ne aggiorno i dati
          If m_nObjTreeOldId <> GDB_ID.NULL Then
-            'UpdateObjDataInObjTree(m_nObjTreeOldId)
+            Application.Msn.NotifyColleagues(Application.UPDATEOBJDATAINOBJTREE, m_nObjTreeOldId)
          End If
       End Sub
 
@@ -416,7 +418,7 @@ Namespace EgtCAM5
          ' ripristino eventuale vecchio oggetto selezionato
          RevertOldIdInObjTree()
          ' stampa dei dati del nuovo oggetto
-         'UpdateObjDataInObjTree(nId)
+         Application.Msn.NotifyColleagues(Application.UPDATEOBJDATAINOBJTREE, nId)
          ' evidenzio l'oggetto
          EgtSetMark(nId)
          m_nObjTreeOldId = nId
diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb
index 0997df0..8a1a2b0 100644
--- a/ProjectPage/ProjectViewModel.vb
+++ b/ProjectPage/ProjectViewModel.vb
@@ -288,15 +288,20 @@ Namespace EgtCAM5
          Application.Msn.Register(Application.ISOVIEWNW, Sub()
                                                             m_ProjectScene.IsoViewNW()
                                                          End Sub)
-         Application.Msn.Register(Application.CURVEDIR, Sub()
-
-                                                        End Sub)
-         Application.Msn.Register(Application.ANALYZE, Sub()
-
-                                                       End Sub)
-         Application.Msn.Register(Application.GETDIST, Sub()
-
-                                                       End Sub)
+         Application.Msn.Register(Application.SETSTATUSANALYZE, Sub()
+                                                                   m_ProjectScene.SetStatusAnalyze()
+                                                                End Sub)
+         Application.Msn.Register(Application.RESETSTATUSANALYZE, Sub()
+                                                                     m_ProjectScene.ResetStatusAnalyze()
+                                                                     Application.Msn.NotifyColleagues(Application.SELECTIDINOBJTREE, GDB_ID.NULL)
+                                                                  End Sub)
+         Application.Msn.Register(Application.SETSTATUSGETDISTANCE, Sub()
+                                                                       m_ProjectScene.SetStatusGetDistance()
+                                                                    End Sub)
+         Application.Msn.Register(Application.RESETSTATUSGETDISTANCE, Sub()
+                                                                         m_ProjectScene.ResetStatusGetDistance()
+                                                                         Application.Msn.NotifyColleagues(Application.NOTIFYSTATUSOUTPUT, String.Empty)
+                                                                      End Sub)
          Application.Msn.Register(Application.CPLANETOP, Sub()
                                                             m_Controller.SetLastInteger(Controller.GRID_TYPE.TOP)
                                                             m_Controller.ExecuteCommand(Controller.CMD.GRID)