diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
new file mode 100644
index 0000000..537943b
--- /dev/null
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -0,0 +1,58 @@
+<Window x:Class="AboutBoxView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="AboutBox" Height="300" Width="300" WindowStyle="None" ResizeMode="NoResize"
+    ShowInTaskbar="False" Visibility="{Binding AboutBoxVisibility,Mode=OneWay}">
+
+   <Border BorderThickness="2" BorderBrush="LightBlue">
+      <Grid >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.5*"/>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="0.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.25*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.25*"/>
+         </Grid.RowDefinitions>
+
+         <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="3*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Border Name="LogoBrd" Grid.Column="1" Background="White">
+               <Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
+            </Border>
+         </Grid>
+         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="18" />
+         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="KeyLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="MachineLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="ProjectLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="18"/>
+         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="8" HorizontalAlignment="Center"
+               VerticalAlignment="Center" FontSize="15" />
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="10" Command="{Binding Close}"
+            Margin="1,0"/>
+
+      </Grid>
+
+   </Border>
+
+</Window>
diff --git a/AboutBoxWindow/AboutBoxView.xaml.vb b/AboutBoxWindow/AboutBoxView.xaml.vb
new file mode 100644
index 0000000..8d4c4d5
--- /dev/null
+++ b/AboutBoxWindow/AboutBoxView.xaml.vb
@@ -0,0 +1,47 @@
+Imports EgtUILib
+
+Public Class AboutBoxView
+
+   ' Riferimento alla MainWindow
+   Private m_MainWindow As Window = Application.Current.MainWindow
+
+   Sub New()
+
+      ' This call is required by the designer.
+      InitializeComponent()
+
+      ' Add any initialization after the InitializeComponent() call.
+      Application.Msn.Register(Application.CLOSEAPPLICATION, Sub()
+                                                                Me.Close()
+                                                             End Sub)
+   End Sub
+
+   Private Sub AboutBoxView_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      Me.Owner = Application.Current.MainWindow
+      Me.Owner = Owner
+      Me.Top = Owner.Top + (Owner.Height / 2 - Me.Height / 2)
+      Me.Left = Owner.Left + (Owner.Width / 2 - Me.Width / 2)
+
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      Me.Visibility = Visibility.Hidden
+   End Sub
+
+   Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      DescriptionLbl.Text = My.Application.Info.Description.ToString()
+      VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
+                                 "." & My.Application.Info.Version.Minor.ToString() &
+                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
+                                 My.Application.Info.Version.Revision.ToString()
+      Dim sKey As String = String.Empty
+      EgtGetKeyInfo(sKey)
+      Dim sOpts As String = IniFile.m_nKeyOptions.ToString()
+      KeyLbl.Text = sKey & " - " & sOpts
+      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
+      'MachineLbl.Text = "Machine : " & m_MainWindow.m_CurrentMachine.sMachineName
+      'ProjectLbl.Text = "Project : " & m_MainWindow.m_CurrentProjectPageUC.GetCurrentProjectName()
+      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+   End Sub
+
+End Class
diff --git a/AboutBoxWindow/AboutBoxViewModel.vb b/AboutBoxWindow/AboutBoxViewModel.vb
new file mode 100644
index 0000000..f3dd8a7
--- /dev/null
+++ b/AboutBoxWindow/AboutBoxViewModel.vb
@@ -0,0 +1,56 @@
+Namespace EgtCAM5
+
+   Public Class AboutBoxViewModel
+      Inherits ViewModelBase
+
+      Private m_AboutBoxVisibility As Visibility
+      Public Property AboutBoxVisibility As Visibility
+         Get
+            Return m_AboutBoxVisibility
+         End Get
+         Set(value As Visibility)
+            If value <> m_AboutBoxVisibility Then
+               m_AboutBoxVisibility = value
+               OnPropertyChanged("AboutBoxVisibility")
+            End If
+         End Set
+      End Property
+      ' Definizione comandi
+      Private m_cmdClose As ICommand
+
+#Region "COMMANDS"
+
+#Region "CloseCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property CloseCommand As ICommand
+         Get
+            If m_cmdClose Is Nothing Then
+               m_cmdClose = New RelayCommand(AddressOf Close, AddressOf CanClose)
+            End If
+            Return m_cmdClose
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub Close(ByVal param As Object)
+         AboutBoxVisibility = Visibility.Hidden
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanClose(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' CloseCommand
+
+#End Region    ' Commands
+   End Class
+
+End Namespace
\ No newline at end of file
diff --git a/Application.xaml.vb b/Application.xaml.vb
index 20f1143..9ae5e84 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -1,4 +1,5 @@
-Imports EgtCAM5.EgtCAM5
+Imports EgtWPFLib5
+Imports EgtCAM5.EgtCAM5
 
 Class Application
 
diff --git a/Constants/ConstMsg.vb b/Constants/ConstMsg.vb
index 13ed22a..5cd6d0e 100644
--- a/Constants/ConstMsg.vb
+++ b/Constants/ConstMsg.vb
@@ -11,7 +11,7 @@
    Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1085
    Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1100
    Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1220
-  'Public Const MSG_MANUALAXESMOVEPAGEUC As Integer = MSG_OMAGCUT + 220
+   Public Const MSG_MISSINGKEYWD As Integer = 10100
    'Public Const MSG_CADCUTPAGEUC As Integer = MSG_OMAGCUT + 300
    'Public Const MSG_NESTPAGEUC As Integer = MSG_OMAGCUT + 330
    'Public Const MSG_SPLITPAGEUC As Integer = MSG_OMAGCUT + 340
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 50d8fed..2beebc5 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -106,6 +106,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AboutBoxWindow\AboutBoxView.xaml.vb">
+      <DependentUpon>AboutBoxView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="AttachedBehaviours\InputBindingsManager.vb" />
     <Compile Include="Base\BaseWindow\BaseWindowView.xaml.vb">
       <DependentUpon>BaseWindowView.xaml</DependentUpon>
@@ -147,28 +150,28 @@
       <DependentUpon>InputExpanderView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\InputExpander\InputExpanderViewModel.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml.vb">
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml.vb">
       <DependentUpon>MachiningTreeExpanderView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderViewModel.vb" />
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\LayerTreeView.vb" />
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderView.xaml.vb">
       <DependentUpon>ManageLayerExpanderView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\ManageLayerExpander\ManageLayerExpanderViewModel.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderView.xaml.vb">
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml.vb">
       <DependentUpon>OperationExpanderView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationListBox.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml.vb">
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationListBox.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml.vb">
       <DependentUpon>OperationPropertyExpanderView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationPropertyExpander\OperationPropertyExpanderViewModel.vb" />
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml.vb">
       <DependentUpon>SimulationExpanderView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjectPage\OptionPanel\DrawOptionPanel\SimulationExpander\SimulationExpanderViewModel.vb" />
+    <Compile Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderViewModel.vb" />
     <Compile Include="ProjectPage\ProjectView.xaml.vb">
       <DependentUpon>ProjectView.xaml</DependentUpon>
     </Compile>
@@ -189,6 +192,10 @@
     </Compile>
     <Compile Include="TopCommandBar\TopCommandBarViewModel.vb" />
     <Compile Include="Utility.vb" />
+    <Page Include="AboutBoxWindow\AboutBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Base\BaseWindow\BaseWindowView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -233,7 +240,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\DrawOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml">
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\MachiningsTreeViewExpander\MachiningTreeExpanderView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -241,15 +248,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationExpander\OperationExpanderView.xaml">
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationExpander\OperationExpanderView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\DrawOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml">
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\OperationPropertyExpander\OperationPropertyExpanderView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjectPage\OptionPanel\DrawOptionPanel\SimulationExpander\SimulationExpanderView.xaml">
+    <Page Include="ProjectPage\OptionPanel\MachiningOptionPanel\SimulationExpander\SimulationExpanderView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -440,6 +447,12 @@
     <Resource Include="Resources\OptionPanel\MachiningOptionPanel\SimulationExpander\PlayStep.png" />
     <Resource Include="Resources\OptionPanel\MachiningOptionPanel\SimulationExpander\Stop.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\EgtCAM5.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\AboutBoxImage.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
diff --git a/IniFile.vb b/IniFile.vb
index 5e51608..5b99a6a 100644
--- a/IniFile.vb
+++ b/IniFile.vb
@@ -5,6 +5,7 @@ Module IniFile
    ' MainWindow Page
    Friend m_nInstance As Integer = 0
    Friend m_nUserLevel As Integer = 1
+   Friend m_nKeyOptions As UInteger
    Public ReadOnly Property nUserLevel As Integer
       Get
          Return m_nUserLevel
diff --git a/MainWindow/MainWindow.xaml b/MainWindow/MainWindow.xaml
index 16bfa5b..07888ad 100644
--- a/MainWindow/MainWindow.xaml
+++ b/MainWindow/MainWindow.xaml
@@ -1,10 +1,11 @@
-<Window x:Class="MainWindow"
+<EgtWPFLib5:EgtCustomWindow x:Class="MainWindow"
    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="MainWindow" Height="768" Width="1366">
+   Title="MainWindow" Height="768" Width="1366" Icon="/Resources/EgtCAM5.ico"
+   WindowStyle="None" AboutBox="{Binding AboutBox}">
 
    <interactivity:Interaction.Triggers>
       <interactivity:EventTrigger EventName="ContentRendered">
@@ -43,4 +44,4 @@
 
    </DockPanel>
 
-</Window>
+</EgtWPFLib5:EgtCustomWindow>
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index ae5273e..2cc1f0d 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -21,7 +21,7 @@ Namespace EgtCAM5
       Private m_sIniFile As String = String.Empty
       Private m_nDebug As Integer = 0
       ' Opzioni abilitate dalla licenza attiva associata alla chiave
-      Private m_nKeyOptions As UInteger
+      'Private m_nKeyOptions As UInteger
       Friend Enum KEY_OPT As UInteger
          BASE = 1
       End Enum
@@ -32,6 +32,14 @@ Namespace EgtCAM5
       ' GRAPHICAL FIELDS
       ' Event commands
       ' MainWindow ContentRendered Event
+
+      Private m_AboutBox As Window
+      Public ReadOnly Property AboutBox As Window
+         Get
+            Return New AboutBoxView
+         End Get
+      End Property
+
       Private m_cmdMainWindow_ContentRendered As ICommand
       ' MainWindow Activated Event
       Private m_cmdMainWindow_Activated As ICommand
@@ -124,6 +132,7 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
+         'Application.Current.MainWindow.Icon = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/EgtCAM5.ico", UriKind.Relative))
          RegisterMyMessages()
          ' INITIALIZE EGALTECH ENVIRONMENT
          InitializeEgtEnvironment()
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
index 570287b..e9f1d3e 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderView.xaml
@@ -5,7 +5,7 @@
 
    <Expander Header="Properties" IsExpanded="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}">
       <UniformGrid>
-         <TextBox Text="{Binding InfoBox}"/>
+         <TextBox Text="{Binding InfoBox}" MaxHeight="200"/>
       </UniformGrid>
    </Expander>
 
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
index 76383a5..9509667 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderView.xaml
@@ -24,6 +24,9 @@
                <interactivity:EventTrigger EventName="MouseDoubleClick">
                   <interactivity:InvokeCommandAction Command="{Binding TreeViewDoubleClickCommand}"/>
                </interactivity:EventTrigger>
+               <interactivity:EventTrigger EventName="PreviewMouseRightButtonDown">
+                  <interactivity:InvokeCommandAction Command="{Binding TreeViewMouseRightButtonCommand}" CommandParameter="{Binding ElementName=LayerTreeView,Path=SelectedItem}"/>
+               </interactivity:EventTrigger>
             </interactivity:Interaction.Triggers>
             <TreeView.Resources>
                <!--Modifico DataTemplate del ToolItem per poter inserire immagine e testo-->
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
index 2e12a4b..0348031 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/ManageLayerExpander/ManageLayerExpanderViewModel.vb
@@ -37,6 +37,7 @@ Namespace EgtCAM5
       Private m_cmdNewLayer As ICommand
       Private m_cmdLayerColor As ICommand
       Private m_cmdTreeViewDoubleClick As ICommand
+      Private m_cmdTreeViewMouseRightButton As ICommand
 
       ' Lista dei layer
       Private m_LayerList As New ObservableCollection(Of LayerTreeViewItem)
@@ -209,6 +210,39 @@ Namespace EgtCAM5
 
 #End Region ' TreeViewDoubleClickCommand
 
+#Region "TreeViewMouseRightButtonCommand"
+
+      ''' <summary>
+      ''' Returns a command that do Point.
+      ''' </summary>
+      Public ReadOnly Property TreeViewMouseRightButtonCommand As ICommand
+         Get
+            If m_cmdTreeViewMouseRightButton Is Nothing Then
+               m_cmdTreeViewMouseRightButton = New RelayCommand(AddressOf TreeViewMouseRightButton, AddressOf CanTreeViewMouseRightButton)
+            End If
+            Return m_cmdTreeViewMouseRightButton
+         End Get
+      End Property
+
+      ''' <summary>
+      ''' Execute the Point.  This method is invoked by the PointCommand.
+      ''' </summary>
+      Public Sub TreeViewMouseRightButton(ByVal param As Object)
+         If m_nObjTreeOldId <> GDB_ID.NULL Then
+            Application.Msn.NotifyColleagues(Application.SETLASTINTEGER, m_nObjTreeOldId)
+            Application.Msn.NotifyColleagues(Application.EXECUTECOMMAND, Controller.CMD.SETCURRPARTLAYER)
+         End If
+      End Sub
+
+      ''' <summary>
+      ''' Returns always true.
+      ''' </summary>
+      Private Function CanTreeViewMouseRightButton(ByVal param As Object) As Boolean
+         Return True
+      End Function
+
+#End Region ' TreeViewMouseRightButtonCommand
+
 #End Region    ' Commands
 
 #Region "METHODS"
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
rename to ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderView.xaml.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationExpanderViewModel.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationExpander/OperationListBox.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderView.xaml.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderViewModel.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/OperationPropertyExpander/OperationPropertyExpanderViewModel.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/OperationPropertyExpander/OperationPropertyExpanderViewModel.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderView.xaml
rename to ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderView.xaml.vb
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
similarity index 100%
rename from ProjectPage/OptionPanel/DrawOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
rename to ProjectPage/OptionPanel/MachiningOptionPanel/SimulationExpander/SimulationExpanderViewModel.vb
diff --git a/Resources/AboutBoxImage.png b/Resources/AboutBoxImage.png
new file mode 100644
index 0000000..a11230b
Binary files /dev/null and b/Resources/AboutBoxImage.png differ
diff --git a/Resources/EgtCAM5.ico b/Resources/EgtCAM5.ico
new file mode 100644
index 0000000..f61aa51
Binary files /dev/null and b/Resources/EgtCAM5.ico differ