diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
index 2402341c..a30c8b05 100644
--- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
@@ -144,6 +144,12 @@
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
+    <Compile Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OnlyProdNewOpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OnlyProdOpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utility\Configuration.vb" />
     <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
@@ -264,6 +270,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -276,7 +290,9 @@
   <ItemGroup>
     <Content Include="Resources\ProjectManager\Save.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{94E38DFF-614B-4CBD-B67C-F211BB35CE8B}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
new file mode 100644
index 00000000..db78187f
--- /dev/null
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml
@@ -0,0 +1,249 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdNewOpenProjectFileDialogV"
+                            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"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsClosable="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="{Binding Filters_Msg}"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+               <CheckBox Grid.Column="2"
+                         IsChecked="{Binding bViewArchived}"
+                         Content="{Binding ViewArchived_Msg}"
+                         VerticalAlignment="Center"/>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="{Binding Rows_Msg}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
+
+      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+                               Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               RowDetailsVisibilityMode="Visible"
+                               CellEditEnding="MainDataGrid_CellEditEnding"
+                               BindingColumns="{Binding ProdColumns}">
+         <DataGrid.Resources>
+            <!-- ProdId -->
+            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!--Name-->
+            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+               <DataGridTextColumn.Header>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                     <ToggleButton Grid.Column="1"
+                                   Margin="5,0,0,0"
+                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                   Style="{StaticResource ToolBar_SmallToggleButton}">
+                        <Image Source="\Resources\CalcPanel\Edit.png"
+                               Style="{StaticResource LockImage}"/>
+                     </ToggleButton>
+                  </Grid>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Creation date -->
+            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Machine -->
+            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Archived -->
+            <DataGridTemplateColumn x:Key="colARCHIVED">
+               <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate>
+                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
+                            Visibility="{Binding Archived_Visibility}"
+                            Height="15"
+                            Width="15"
+                            Stretch="UniformToFill"/>
+                  </DataTemplate>
+               </DataGridTemplateColumn.CellTemplate>
+               <DataGridTemplateColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+               </DataGridTemplateColumn.Header>
+            </DataGridTemplateColumn>
+         </DataGrid.Resources>
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="FontWeight" Value="DemiBold"/>
+               <Setter Property="VerticalContentAlignment" Value="Center"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+         <DataGrid.RowDetailsTemplate>
+            <DataTemplate>
+               <ItemsControl ItemsSource="{Binding ProjFileList}"
+                             BorderThickness="0"
+                             Margin="0,-1,0,0"
+                             Padding="0">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid TextBlock.FontSize="12"
+                              TextBlock.FontWeight="Normal">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="1"/>
+                              <RowDefinition Height="1*"/>
+                           </Grid.RowDefinitions>
+                           <Grid Grid.Row="0"
+                                 Grid.ColumnSpan="2"
+                                 Background="Gray"
+                                 Margin="40,0,40,0"/>
+                           <Grid Grid.Column="1"
+                                 Grid.Row="1"
+                                 Margin="2">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="1*"/>
+                                 <RowDefinition Height="1*"/>
+                              </Grid.RowDefinitions>
+                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="{Binding sBTLFileName}"/>
+                              <TextBlock Grid.Row="1"
+                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Grid.Row="1"
+                                         Text="{Binding sListName}"/>
+                              <TextBlock Grid.Column="2"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="3"
+                                         Text="{Binding dtExportDate}"/>
+                           </Grid>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </DataTemplate>
+         </DataGrid.RowDetailsTemplate>
+      </EgtBEAMWALL:EgtDataGrid>
+
+      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Archive_Msg}"
+                 Command="{Binding Archive_Command}"
+                 IsEnabled="{Binding bArchived_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Delete_Msg}"
+                 Command="{Binding Delete_Command}"
+                 IsEnabled="{Binding bDelete_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Command="{Binding Cancel_Command}"
+                 Content="{Binding Cancel_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb
new file mode 100644
index 00000000..97d98ede
--- /dev/null
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb
@@ -0,0 +1,80 @@
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Input
+Imports EgtWPFLib5
+
+Public Class OnlyProdNewOpenProjectFileDialogV
+
+   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
+      ' Funzione che interpreta l'xaml
+      InitializeComponent()
+      Me.Owner = Owner
+      Me.DataContext = OpenProjFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
+      m_OpenProjFileDialogVM.ProjDoubleClick()
+   End Sub
+
+#End Region    ' EVENTS
+
+   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
+      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
+      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
+   End Sub
+
+End Class
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
new file mode 100644
index 00000000..6423ec27
--- /dev/null
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml
@@ -0,0 +1,189 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdOpenProjectFileDialogV"
+                            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"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Filters"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="Rows"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
+
+      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               BindingColumns="{Binding ProjectColumns}">
+         <DataGrid.Resources>
+            <!-- ProjId -->
+            <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- ProdId -->
+            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Project Name -->
+            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- BTL FileName -->
+            <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- ListName -->
+            <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Exported date -->
+            <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!-- Creation date -->
+            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Machine -->
+            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Name (per Prod) -->
+            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+         </DataGrid.Resources>
+
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+      </EgtBEAMWALL:EgtDataGrid>
+
+      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Delete_Msg}"
+                 Command="{Binding Delete_Command}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button IsCancel="True"
+                 Content="{Binding Cancel_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb
new file mode 100644
index 00000000..f9fd9403
--- /dev/null
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb
@@ -0,0 +1,75 @@
+Imports System.Windows
+Imports System.Windows.Input
+Imports EgtWPFLib5
+
+Public Class OnlyProdOpenProjectFileDialogV
+
+   Private WithEvents m_OpenProjFileDialogVM As OpenProjectFileDialogVM
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, OpenProjFileDialogVM As OpenProjectFileDialogVM)
+      ' Funzione che interpreta l'xaml
+      InitializeComponent()
+      Me.Owner = Owner
+      Me.DataContext = OpenProjFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
+      m_OpenProjFileDialogVM.ProjDoubleClick()
+   End Sub
+
+#End Region    ' EVENTS
+
+   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
+      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
index b67033c7..232b0570 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
@@ -121,17 +121,17 @@
       </StackPanel>-->
 
       <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-               ItemsSource="{Binding ProjectList}" 
-               SelectedItem="{Binding SelProject}"
-               CanUserAddRows="False"
-               AutoGenerateColumns="False"
-               CanUserResizeRows="False"
-               SelectionMode="Single"
-               ScrollViewer.CanContentScroll="True" 
-               ScrollViewer.VerticalScrollBarVisibility="Auto"
-               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-               Margin="5"
-               BindingColumns="{Binding ProjectColumns}">
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>
             <!-- ProjId -->
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
index 4634bc0d..59b404f7 100644
--- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb
@@ -663,7 +663,7 @@ Public Class MachParam
       End Get
       Set(value As Double)
          m_dValue = value
-         NotifyPropertyChanged("sValue")
+         NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property
 
diff --git a/EgtBEAMWALL.Supervisor/Project/ProjectVM.vb b/EgtBEAMWALL.Supervisor/Project/ProjectVM.vb
index 30b7a907..88fb26dd 100644
--- a/EgtBEAMWALL.Supervisor/Project/ProjectVM.vb
+++ b/EgtBEAMWALL.Supervisor/Project/ProjectVM.vb
@@ -174,14 +174,14 @@ Public Class ProjectVM
    End Sub
 
    Friend Sub NotifyAllPanelVisibility()
-      NotifyPropertyChanged("LeftPanel_Visibility")
-      NotifyPropertyChanged("TopPanel_Visibility")
-      NotifyPropertyChanged("BottomPanel_Visibility")
-      NotifyPropertyChanged("PartManager_Visibility")
-      NotifyPropertyChanged("FeatureManager_Visibility")
-      NotifyPropertyChanged("ShowBeamPanel_Visibility")
-      NotifyPropertyChanged("ProjManager_Visibility")
-      NotifyPropertyChanged("ProdManager_Visibility")
+      NotifyPropertyChanged(NameOf(LeftPanel_Visibility))
+      NotifyPropertyChanged(NameOf(TopPanel_Visibility))
+      NotifyPropertyChanged(NameOf(BottomPanel_Visibility))
+      NotifyPropertyChanged(NameOf(PartManager_Visibility))
+      NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
+      NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
+      NotifyPropertyChanged(NameOf(ProjManager_Visibility))
+      NotifyPropertyChanged(NameOf(ProdManager_Visibility))
    End Sub
 
 #End Region    ' FIELDS & PROPERTIES
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb
index 916a6e4e..18745851 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/AddPartWnd/AddPartWndVM.vb
@@ -43,7 +43,7 @@ Public Class AddPartWndVM
          If StringToLenAdv(value, dTempL, True) AndAlso dTempL > 0 Then
             m_dL = dTempL
          Else
-            NotifyPropertyChanged("sL")
+            NotifyPropertyChanged(NameOf(sL))
          End If
       End Set
    End Property
@@ -64,7 +64,7 @@ Public Class AddPartWndVM
             EgtDraw()
             m_dW = dTempW
          Else
-            NotifyPropertyChanged("sW")
+            NotifyPropertyChanged(NameOf(sW))
          End If
       End Set
    End Property
@@ -85,7 +85,7 @@ Public Class AddPartWndVM
             EgtDraw()
             m_dH = dTempH
          Else
-            NotifyPropertyChanged("sH")
+            NotifyPropertyChanged(NameOf(sH))
          End If
       End Set
    End Property
@@ -115,7 +115,7 @@ Public Class AddPartWndVM
          If Integer.TryParse(value, nTempCNT) AndAlso nTempCNT > 0 Then
             m_nCNT = nTempCNT
          Else
-            NotifyPropertyChanged("sCNT")
+            NotifyPropertyChanged(NameOf(sCNT))
          End If
       End Set
    End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb
index 8a2b9ba8..21877906 100644
--- a/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb
@@ -235,14 +235,14 @@ Public Class Variable
                If StringToLenAdv(value, dTempValue, True) Then
                   m_dValue = dTempValue
                Else
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                End If
             Case Else         ' VariableType.DOUBLE_
                Dim dTempValue As Double
                If StringToDoubleAdv(value, dTempValue, True) Then
                   m_dValue = dTempValue
                Else
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                End If
          End Select
       End Set
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
index fafed97a..f7040d61 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb
@@ -107,7 +107,7 @@ Public Class BTLFeatureVM
                ' rendo non calcolata questa feature
                ResetCalcFeature()
             End If
-            NotifyPropertyChanged("nSelSIDE")
+            NotifyPropertyChanged(NameOf(nSelSIDE))
             If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
             EgtDraw()
          End If
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb
index 5d7bc497..09a1aadb 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb
@@ -132,7 +132,7 @@ Public Class BTLParamVM
                ' verifico che sia compreso tra minimo e massimo
                If dNewValue < m_BTLParamM.dMin OrElse dNewValue > m_BTLParamM.dMax Then
                   MessageBox.Show(EgtMsg(61856), EgtMsg(30007))
-                  NotifyPropertyChanged("sValue")
+                  NotifyPropertyChanged(NameOf(sValue))
                   Return
                End If
                ' recupero ParentPart
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
index c07fd43c..3888ebaf 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb
@@ -375,7 +375,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_SINGLEMEMBERNUM, value) Then
             m_BTLPartM.nSINGLEMEMBERNUM = value
          Else
-            NotifyPropertyChanged("nSINGLEMEMBERNUM")
+            NotifyPropertyChanged(NameOf(nSINGLEMEMBERNUM))
          End If
       End Set
    End Property
@@ -388,7 +388,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ASSEMBLYNUM, value) Then
             m_BTLPartM.sASSEMBLYNUM = value
          Else
-            NotifyPropertyChanged("sASSEMBLYNUM")
+            NotifyPropertyChanged(NameOf(sASSEMBLYNUM))
          End If
       End Set
    End Property
@@ -401,7 +401,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ORDERNUM, value) Then
             m_BTLPartM.nORDERNUM = value
          Else
-            NotifyPropertyChanged("nORDERNUM")
+            NotifyPropertyChanged(NameOf(nORDERNUM))
          End If
       End Set
    End Property
@@ -414,7 +414,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_DESIGNATION, value) Then
             m_BTLPartM.sDESIGN = value
          Else
-            NotifyPropertyChanged("sDESIGN")
+            NotifyPropertyChanged(NameOf(sDESIGN))
          End If
       End Set
    End Property
@@ -427,7 +427,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ANNOTATION, value) Then
             m_BTLPartM.sANNOT = value
          Else
-            NotifyPropertyChanged("sANNOT")
+            NotifyPropertyChanged(NameOf(sANNOT))
          End If
       End Set
    End Property
@@ -440,7 +440,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STOREY, value) Then
             m_BTLPartM.sSTOREY = value
          Else
-            NotifyPropertyChanged("sSTOREY")
+            NotifyPropertyChanged(NameOf(sSTOREY))
          End If
       End Set
    End Property
@@ -453,7 +453,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_GROUP, value) Then
             m_BTLPartM.sGROUP = value
          Else
-            NotifyPropertyChanged("sGROUP")
+            NotifyPropertyChanged(NameOf(sGROUP))
          End If
       End Set
    End Property
@@ -466,7 +466,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PACKAGE, value) Then
             m_BTLPartM.sPACKAGE = value
          Else
-            NotifyPropertyChanged("sPACKAGE")
+            NotifyPropertyChanged(NameOf(sPACKAGE))
          End If
       End Set
    End Property
@@ -520,7 +520,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_TIMBERGRADE, value) Then
             m_BTLPartM.sTIMBERGRADE = value
          Else
-            NotifyPropertyChanged("sTIMBERGRADE")
+            NotifyPropertyChanged(NameOf(sTIMBERGRADE))
          End If
       End Set
    End Property
@@ -533,7 +533,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_QUALITYGRADE, value) Then
             m_BTLPartM.sQUALITYGRADE = value
          Else
-            NotifyPropertyChanged("sQUALITYGRADE")
+            NotifyPropertyChanged(NameOf(sQUALITYGRADE))
          End If
       End Set
    End Property
@@ -563,7 +563,7 @@ Public Class BTLPartVM
             m_BTLPartM.m_colCOLOR.A = Color3d.Clamp(nCOLA, 0, 100)
             EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COLOUR, m_BTLPartM.colCOLOR.ToString())
          Else
-            NotifyPropertyChanged("sCOLRGB")
+            NotifyPropertyChanged(NameOf(sCOLRGB))
          End If
       End Set
    End Property
@@ -576,8 +576,8 @@ Public Class BTLPartVM
          If m_BTLPartM.colCOLOR.A <> value Then
             m_BTLPartM.m_colCOLOR.A = Color3d.Clamp(value, 0, 100)
             EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COLOUR, m_BTLPartM.colCOLOR.ToString())
-            NotifyPropertyChanged("nCOLA")
-            NotifyPropertyChanged("PartColour")
+            NotifyPropertyChanged(NameOf(nCOLA))
+            NotifyPropertyChanged(NameOf(PartColour))
          End If
       End Set
    End Property
@@ -591,7 +591,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempPlaningLen, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PLANINGLENGTH, dTempPlaningLen) Then
             m_BTLPartM.dPLANINGLEN = dTempPlaningLen
          Else
-            NotifyPropertyChanged("dPLANINGLEN")
+            NotifyPropertyChanged(NameOf(dPLANINGLEN))
          End If
       End Set
    End Property
@@ -605,7 +605,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempStartOffset, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STARTOFFSET, dTempStartOffset) Then
             m_BTLPartM.dSTARTOFFSET = dTempStartOffset
          Else
-            NotifyPropertyChanged("dSTARTOFFSET")
+            NotifyPropertyChanged(NameOf(dSTARTOFFSET))
          End If
       End Set
    End Property
@@ -619,7 +619,7 @@ Public Class BTLPartVM
          If StringToLenAdv(value, dTempEndOffset, True) AndAlso EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ENDOFFSET, dTempEndOffset) Then
             m_BTLPartM.dENDOFFSET = dTempEndOffset
          Else
-            NotifyPropertyChanged("dENDOFFSET")
+            NotifyPropertyChanged(NameOf(dENDOFFSET))
          End If
       End Set
    End Property
@@ -638,11 +638,11 @@ Public Class BTLPartVM
          If m_BTLPartM.SelUID <> value Then
             m_BTLPartM.m_refTransf = m_BTLPartM.refTransfList(value)
             m_BTLPartM.SelUID = value
-            NotifyPropertyChanged("TransfOrig")
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfOrig))
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("SelUID")
+            NotifyPropertyChanged(NameOf(SelUID))
          End If
       End Set
    End Property
@@ -677,7 +677,7 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
          Else
-            NotifyPropertyChanged("TransfOrig")
+            NotifyPropertyChanged(NameOf(TransfOrig))
          End If
       End Set
    End Property
@@ -712,10 +712,10 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.x, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("TransfVersX")
+            NotifyPropertyChanged(NameOf(TransfVersX))
          End If
       End Set
    End Property
@@ -750,10 +750,10 @@ Public Class BTLPartVM
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.x, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.y, 6) & "," &
                                                                          DoubleToString(m_BTLPartM.refTransf.VersY.z, 6))
-            NotifyPropertyChanged("TransfVersX")
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersX))
+            NotifyPropertyChanged(NameOf(TransfVersY))
          Else
-            NotifyPropertyChanged("TransfVersY")
+            NotifyPropertyChanged(NameOf(TransfVersY))
          End If
       End Set
    End Property
@@ -782,7 +782,7 @@ Public Class BTLPartVM
                                                   " P04: " & sValArray(3)) Then
             m_BTLPartM.SelCAMBERSIDE = value
          Else
-            NotifyPropertyChanged("SelCAMBERSIDE")
+            NotifyPropertyChanged(NameOf(SelCAMBERSIDE))
          End If
       End Set
    End Property
@@ -807,7 +807,7 @@ Public Class BTLPartVM
                                                   " P03: " & sValArray(2) &
                                                   " P04: " & sValArray(3))
          Else
-            NotifyPropertyChanged("CamberParams")
+            NotifyPropertyChanged(NameOf(CamberParams))
          End If
       End Set
    End Property
@@ -839,7 +839,7 @@ Public Class BTLPartVM
                                                       " P14: " & sValArray(3)) Then
             m_BTLPartM.SelREFSIDEFIXCLAMP = value
          Else
-            NotifyPropertyChanged("SelREFSIDEFIXCLAMP")
+            NotifyPropertyChanged(NameOf(SelREFSIDEFIXCLAMP))
          End If
       End Set
    End Property
@@ -867,7 +867,7 @@ Public Class BTLPartVM
                                                       " P13: " & sValArray(2) &
                                                       " P14: " & sValArray(3))
          Else
-            NotifyPropertyChanged("PartOffsetParams")
+            NotifyPropertyChanged(NameOf(PartOffsetParams))
          End If
       End Set
    End Property
@@ -888,7 +888,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_PROCESSINGQUALITY, sValue) Then
             m_BTLPartM.SelPROCESSINGQUALITY = value
          Else
-            NotifyPropertyChanged("SelPROCESSINGQUALITY")
+            NotifyPropertyChanged(NameOf(SelPROCESSINGQUALITY))
          End If
       End Set
    End Property
@@ -909,7 +909,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_RECESS, sValue) Then
             m_BTLPartM.SelRECESS = value
          Else
-            NotifyPropertyChanged("SelRECESS")
+            NotifyPropertyChanged(NameOf(SelRECESS))
          End If
       End Set
    End Property
@@ -930,7 +930,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_STOREYTYPE, sValue) Then
             m_BTLPartM.SelSTOREYTYPE = value
          Else
-            NotifyPropertyChanged("SelSTOREYTYPE")
+            NotifyPropertyChanged(NameOf(SelSTOREYTYPE))
          End If
       End Set
    End Property
@@ -943,7 +943,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ELEMENTNUM, value) Then
             m_BTLPartM.sELEMENTNUM = value
          Else
-            NotifyPropertyChanged("sELEMENTNUM")
+            NotifyPropertyChanged(NameOf(sELEMENTNUM))
          End If
       End Set
    End Property
@@ -956,7 +956,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_LAYER, value) Then
             m_BTLPartM.nLAYER = value
          Else
-            NotifyPropertyChanged("nLAYER")
+            NotifyPropertyChanged(NameOf(nLAYER))
          End If
       End Set
    End Property
@@ -969,7 +969,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MODULENUM, value) Then
             m_BTLPartM.sMODULENUM = value
          Else
-            NotifyPropertyChanged("sMODULENUM")
+            NotifyPropertyChanged(NameOf(sMODULENUM))
          End If
       End Set
    End Property
@@ -996,7 +996,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_COMMENT, value) Then
             m_BTLPartM.sCOMMENT = value
          Else
-            NotifyPropertyChanged("sCOMMENT")
+            NotifyPropertyChanged(NameOf(sCOMMENT))
          End If
       End Set
    End Property
@@ -1020,7 +1020,7 @@ Public Class BTLPartVM
                                                     sValArray(2) & ";" &
                                                     If(bGRAINDIRALIGN, 1, 0))
          Else
-            NotifyPropertyChanged("GrainDirection")
+            NotifyPropertyChanged(NameOf(GrainDirection))
          End If
       End Set
    End Property
@@ -1040,7 +1040,7 @@ Public Class BTLPartVM
                                                     sValArray(2) & ";" &
                                                     If(value, 1, 0)) Then
             m_BTLPartM.bGRAINDIRALIGN = value
-            NotifyPropertyChanged("bGRAINDIRALIGN")
+            NotifyPropertyChanged(NameOf(bGRAINDIRALIGN))
          End If
       End Set
    End Property
@@ -1059,7 +1059,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_REFSIDE, (value + 1) & ";" & If(bREFSIDEALIGN, 1, 0)) Then
             m_BTLPartM.SelREFSIDE = value
          Else
-            NotifyPropertyChanged("SelREFSIDE")
+            NotifyPropertyChanged(NameOf(SelREFSIDE))
          End If
       End Set
    End Property
@@ -1071,7 +1071,7 @@ Public Class BTLPartVM
       Set(value As Boolean)
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_REFSIDE, (SelREFSIDE + 1) & ";" & If(value, 1, 0)) Then
             m_BTLPartM.bREFSIDEALIGN = value
-            NotifyPropertyChanged("bREFSIDEALIGN")
+            NotifyPropertyChanged(NameOf(bREFSIDEALIGN))
          End If
       End Set
    End Property
@@ -1094,7 +1094,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ALIGNMENT, sValueLoc & ": " & sValueEnd) Then
             m_BTLPartM.SelALIGNLOCATION = value
          Else
-            NotifyPropertyChanged("SelALIGNLOCATION")
+            NotifyPropertyChanged(NameOf(SelALIGNLOCATION))
          End If
       End Set
    End Property
@@ -1117,7 +1117,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_ALIGNMENT, sValueLoc & ": " & sValueEnd) Then
             m_BTLPartM.SelALIGNENDTYPE = value
          Else
-            NotifyPropertyChanged("SelALIGNENDTYPE")
+            NotifyPropertyChanged(NameOf(SelALIGNENDTYPE))
          End If
       End Set
    End Property
@@ -1138,7 +1138,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & sMATERIALTYPESPEC) Then
             m_BTLPartM.SelMATERIALTYPEGRP = value
          Else
-            NotifyPropertyChanged("SelMATERIALTYPEGRP")
+            NotifyPropertyChanged(NameOf(SelMATERIALTYPEGRP))
          End If
       End Set
    End Property
@@ -1153,7 +1153,7 @@ Public Class BTLPartVM
          If EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_MATERIALTYPE, sValue & ": " & value) Then
             m_BTLPartM.sMATERIALTYPESPEC = value
          Else
-            NotifyPropertyChanged("sMATERIALTYPESPEC")
+            NotifyPropertyChanged(NameOf(sMATERIALTYPESPEC))
          End If
       End Set
    End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
index 2bb705b4..7521f7ca 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
@@ -574,7 +574,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJNUM, value) Then
             m_BTLStructureM.m_sPROJNUM = value
          Else
-            NotifyPropertyChanged("sPROJNUM")
+            NotifyPropertyChanged(NameOf(sPROJNUM))
          End If
       End Set
    End Property
@@ -587,7 +587,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJNAME, value) Then
             m_BTLStructureM.m_sPROJNAME = value
          Else
-            NotifyPropertyChanged("sPROJNAME")
+            NotifyPropertyChanged(NameOf(sPROJNAME))
          End If
       End Set
    End Property
@@ -600,7 +600,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJPART, value) Then
             m_BTLStructureM.m_sPROJPART = value
          Else
-            NotifyPropertyChanged("sPROJPART")
+            NotifyPropertyChanged(NameOf(sPROJPART))
          End If
       End Set
    End Property
@@ -613,7 +613,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_PROJGUID, value) Then
             m_BTLStructureM.m_sPROJGUID = value
          Else
-            NotifyPropertyChanged("sPROJGUID")
+            NotifyPropertyChanged(NameOf(sPROJGUID))
          End If
       End Set
    End Property
@@ -650,7 +650,7 @@ Public Class BTLStructureVM
             DbControllers.m_ProjController.UpdateListName(ProjectManagerVM.CurrProj.nProjId, value)
             m_BTLStructureM.m_sLISTNAME = value
          Else
-            NotifyPropertyChanged("sLISTNAME")
+            NotifyPropertyChanged(NameOf(sLISTNAME))
          End If
       End Set
    End Property
@@ -663,7 +663,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_CUSTOMER, value) Then
             m_BTLStructureM.m_sCUSTOMER = value
          Else
-            NotifyPropertyChanged("sCUSTOMER")
+            NotifyPropertyChanged(NameOf(sCUSTOMER))
          End If
       End Set
    End Property
@@ -676,7 +676,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_ARCHITECT, value) Then
             m_BTLStructureM.m_sARCHITECT = value
          Else
-            NotifyPropertyChanged("sARCHITECT")
+            NotifyPropertyChanged(NameOf(sARCHITECT))
          End If
       End Set
    End Property
@@ -689,7 +689,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EDITOR, value) Then
             m_BTLStructureM.m_sEDITOR = value
          Else
-            NotifyPropertyChanged("sEDITOR")
+            NotifyPropertyChanged(NameOf(sEDITOR))
          End If
       End Set
    End Property
@@ -702,7 +702,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_DELIVDATE, value) Then
             m_BTLStructureM.m_sDELIVDATE = value
          Else
-            NotifyPropertyChanged("sDELIVDATE")
+            NotifyPropertyChanged(NameOf(sDELIVDATE))
          End If
       End Set
    End Property
@@ -715,7 +715,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPDATE, value) Then
             m_BTLStructureM.m_sEXPDATE = value
          Else
-            NotifyPropertyChanged("sEXPDATE")
+            NotifyPropertyChanged(NameOf(sEXPDATE))
          End If
       End Set
    End Property
@@ -728,7 +728,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPTIME, value) Then
             m_BTLStructureM.m_sEXPTIME = value
          Else
-            NotifyPropertyChanged("sEXPTIME")
+            NotifyPropertyChanged(NameOf(sEXPTIME))
          End If
       End Set
    End Property
@@ -741,7 +741,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPRELEASE, value) Then
             m_BTLStructureM.m_sEXPRELEASE = value
          Else
-            NotifyPropertyChanged("sEXPRELEASE")
+            NotifyPropertyChanged(NameOf(sEXPRELEASE))
          End If
       End Set
    End Property
@@ -754,7 +754,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_LANGUAGE, value) Then
             m_BTLStructureM.m_sLANGUAGE = value
          Else
-            NotifyPropertyChanged("sLANGUAGE")
+            NotifyPropertyChanged(NameOf(sLANGUAGE))
          End If
       End Set
    End Property
@@ -775,7 +775,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_RANGE, sValue) Then
             m_BTLStructureM.m_SelRANGE = value
          Else
-            NotifyPropertyChanged("SelRANGE")
+            NotifyPropertyChanged(NameOf(SelRANGE))
          End If
       End Set
    End Property
@@ -796,7 +796,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_PRT_PROCESSINGQUALITY, sValue) Then
             m_BTLStructureM.m_SelPROCESSINGQUALITY = value
          Else
-            NotifyPropertyChanged("SelPROCESSINGQUALITY")
+            NotifyPropertyChanged(NameOf(SelPROCESSINGQUALITY))
          End If
       End Set
    End Property
@@ -809,7 +809,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_COMPUTERNAME, value) Then
             m_BTLStructureM.m_sCOMPUTERNAME = value
          Else
-            NotifyPropertyChanged("sCOMPUTERNAME")
+            NotifyPropertyChanged(NameOf(sCOMPUTERNAME))
          End If
       End Set
    End Property
@@ -822,7 +822,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_USER, value) Then
             m_BTLStructureM.m_sUSER = value
          Else
-            NotifyPropertyChanged("sUSER")
+            NotifyPropertyChanged(NameOf(sUSER))
          End If
       End Set
    End Property
@@ -835,7 +835,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_SRCFILE, value) Then
             m_BTLStructureM.m_sSRCFILE = value
          Else
-            NotifyPropertyChanged("sSRCFILE")
+            NotifyPropertyChanged(NameOf(sSRCFILE))
          End If
       End Set
    End Property
@@ -848,7 +848,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_EXPFILE, value) Then
             m_BTLStructureM.m_sEXPFILE = value
          Else
-            NotifyPropertyChanged("sEXPFILE")
+            NotifyPropertyChanged(NameOf(sEXPFILE))
          End If
       End Set
    End Property
@@ -869,7 +869,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_PRT_RECESS, sValue) Then
             m_BTLStructureM.m_SelRECESS = value
          Else
-            NotifyPropertyChanged("SelRECESS")
+            NotifyPropertyChanged(NameOf(SelRECESS))
          End If
       End Set
    End Property
@@ -882,7 +882,7 @@ Public Class BTLStructureVM
          If EgtSetInfo(m_BTLStructureM.nBTLInfoId, BTL_GEN_USERATTRIBUTE, value) Then
             m_BTLStructureM.m_sUSERATTRIBUTE = value
          Else
-            NotifyPropertyChanged("sUSERATTRIBUTE")
+            NotifyPropertyChanged(NameOf(sUSERATTRIBUTE))
          End If
       End Set
    End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
index e73e0a6c..685f8a2d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb
@@ -59,7 +59,7 @@ Public Class ChangeParameterWndVM
       End Get
       Set(value As Parameters)
          m_SelParam = value
-         NotifyPropertyChanged("SelParam")
+         NotifyPropertyChanged(NameOf(SelParam))
       End Set
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
index 3cb2541b..a8b2b526 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -1208,7 +1208,7 @@ Public Class MachParam
          If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then
             Map.refConfigurationPageVM.bModifyMachParam = Map.refConfigurationPageVM.VerifyConfigPagePassword()
             If Not Map.refConfigurationPageVM.bModifyMachParam Then
-               NotifyPropertyChanged("sValue")
+               NotifyPropertyChanged(NameOf(sValue))
                m_IsModifiedValue = False
                Return
             End If
@@ -1228,7 +1228,7 @@ Public Class MachParam
       End Get
       Set(value As Double)
          m_dValue = value
-         NotifyPropertyChanged("sValue")
+         NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb
index 92480652..c29d08fb 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb
@@ -68,7 +68,7 @@ Public Class MachinePanelVM
       End Get
       Set(value As Boolean)
          m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged("MachPanel_IsEnabled")
+         NotifyPropertyChanged(NameOf(MachPanel_IsEnabled))
       End Set
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
index 4f7dab85..23d2c2e6 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
@@ -782,7 +782,7 @@ Public Class MainMenuVM
    ''' Execute the SendFeedback.  This method is invoked by the SendFeedbackCommand.
    ''' </summary>
    Public Sub SendFeedback(ByVal param As Object)
-      If SelPage = Pages.MACHINING AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
+      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.ONLYPRODPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProd) Then
          MessageBox.Show(EgtMsg(61891), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
@@ -816,7 +816,7 @@ Public Class MainMenuVM
       'End If
       ' Esporto il progetto
       Dim ProjFileMList As List(Of ProjFileM)
-      If SelPage = Pages.MACHINING And Not IsNothing(ProjectManagerVM.CurrProd) Then
+      If (SelPage = Pages.MACHINING OrElse SelPage = Pages.ONLYPRODPAGE) And Not IsNothing(ProjectManagerVM.CurrProd) Then
          ProjFileMList = DbControllers.m_ProjController.GetByProdAsc(ProjectManagerVM.CurrProd.nProdId)
          Map.refProjManagerVM.SetCurrProj(ProjFileMList(0).nProjId)
       End If
@@ -838,7 +838,7 @@ Public Class MainMenuVM
             Select Case Map.refMainMenuVM.SelPage
                Case Pages.VIEW
                   ProdId = ProjectManagerVM.CurrProj.nProdId
-               Case Pages.MACHINING
+               Case Pages.MACHINING, Pages.ONLYPRODPAGE
                   ProdId = ProjectManagerVM.CurrProd.nProdId
             End Select
             If ProdId = 0 Then
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index 6d7929ff..7d48bcde 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
@@ -205,7 +205,7 @@ Public Class MainWindowVM
             Integer.TryParse(sPjId, PjId)
             If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
                Map.refOnlyProdManagerVM.SetCurrProd(PjId)
-               If Not IsNothing(Map.refOnlyProdManagerVM.CurrProd) Then Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjIdList(0))
+               If Not IsNothing(Map.refOnlyProdManagerVM.CurrProj) Then Map.refOnlyProdManagerVM.SetCurrProj(Map.refOnlyProdManagerVM.CurrProd.nProjIdList(0))
             Else
                Map.refProjManagerVM.SetCurrProj(PjId)
             End If
diff --git a/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
index 7e6dfbc7..059a8a0c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
@@ -203,9 +203,7 @@ Public Class OnlyProdManagerVM
       ' Impostazioni MruLists
       m_MruFiles.Init(S_MRUPROJFILES, 8)
       ' leggo attivazione update btl
-      If GetMainPrivateProfileInt(S_GENERAL, K_UPDATEBTL, 0) > 0 Then
-         UpdateBTL_Visibility = Visibility.Visible
-      End If
+      If GetMainPrivateProfileInt(S_GENERAL, K_UPDATEBTL, 0) > 0 Then UpdateBTL_Visibility = Visibility.Visible
 
       ' abilito passaggio a supervisore
       If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.SUPERVISOR) Then
@@ -548,7 +546,7 @@ Public Class OnlyProdManagerVM
             Dim OpenProdFileDialogVM As NewOpenProjectFileDialogVM = Nothing
             ' apro dialogo di scelta Prod
             OpenProdFileDialogVM = New NewOpenProjectFileDialogVM
-            Dim OpenFile As New NewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM)
+            Dim OpenFile As New OnlyProdNewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM)
             Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
             If IsNothing(DialogResult) OrElse Not DialogResult Then Return
             sFilePath = OpenProdFileDialogVM.SelProject.ProdFileVM.sProdPath
@@ -557,7 +555,7 @@ Public Class OnlyProdManagerVM
             Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
             ' apro dialogo di scelta file
             OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-            Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+            Dim OpenFile As New OnlyProdOpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
             Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
             If IsNothing(DialogResult) OrElse Not DialogResult Then Return
             sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 8896ac8f..2618ce0a 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -47,7 +47,7 @@ Public Class ProjManagerVM
       Set(value As Boolean)
          If value <> m_IsEnabled Then
             m_IsEnabled = value
-            NotifyPropertyChanged("IsEnabled")
+            NotifyPropertyChanged(NameOf(IsEnabled))
          End If
       End Set
    End Property
diff --git a/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpSupportClass.vb b/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpSupportClass.vb
index 852a74c4..410e7b53 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpSupportClass.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpSupportClass.vb
@@ -296,7 +296,7 @@ Public Class ExitToolAssociation
       Set(value As Boolean)
          If value <> m_IsOccupied Then
             m_IsOccupied = value
-            NotifyPropertyChanged("IsOccupied")
+            NotifyPropertyChanged(NameOf(IsOccupied))
          End If
       End Set
    End Property
@@ -312,7 +312,7 @@ Public Class ExitToolAssociation
       Set(value As Boolean)
          If value <> m_IsEnabledPos Then
             m_IsEnabledPos = value
-            NotifyPropertyChanged("IsEnabledPos")
+            NotifyPropertyChanged(NameOf(IsEnabledPos))
          End If
       End Set
    End Property
@@ -327,7 +327,7 @@ Public Class ExitToolAssociation
       End Get
       Set(value As Boolean?)
          m_IsValidPos = value
-         NotifyPropertyChanged("ExitBtnBackgroundCol")
+         NotifyPropertyChanged(NameOf(ExitBtnBackgroundCol))
       End Set
    End Property
 
@@ -390,7 +390,7 @@ Public Class ExitToolAssociation
             m_IsAppliedTool = IsNothing(m_Tool) And IsNothing(m_OrigTool)
          End If
          m_IsModifiedTool = True
-         NotifyPropertyChanged("Tool")
+         NotifyPropertyChanged(NameOf(Tool))
          m_delIsModifiedSetUp()
       End Set
    End Property
@@ -402,7 +402,7 @@ Public Class ExitToolAssociation
          m_IsAppliedTool = IsNothing(m_Tool) And IsNothing(m_OrigTool)
       End If
       m_IsModifiedTool = False
-      NotifyPropertyChanged("Tool")
+      NotifyPropertyChanged(NameOf(Tool))
    End Sub
 
 #Region "Messages"
@@ -488,7 +488,7 @@ Public Class ExitToolAssociation
          ' se quello selezionato nella lista non è un utensile esco
          If Not TypeOf param Is ToolItem Then
             m_IsOccupied = False
-            NotifyPropertyChanged("IsOccupied")
+            NotifyPropertyChanged(NameOf(IsOccupied))
             Return
          End If
          Dim SelTool As ToolItem = DirectCast(param, ToolItem)
@@ -508,7 +508,7 @@ Public Class ExitToolAssociation
             EgtTdbGetToolFromUUID(SelTool.Uuid, sToolName)
             EgtOutLog("Error in setup! Tool:" & sToolName & " TcPos: " & m_MyPos.TcPos)
             m_IsOccupied = False
-            NotifyPropertyChanged("IsOccupied")
+            NotifyPropertyChanged(NameOf(IsOccupied))
             Return
          End If
          ' se la testa restituita non coincide con quella della posizione
@@ -532,7 +532,7 @@ Public Class ExitToolAssociation
                Exit For
             End If
          Next
-         NotifyPropertyChanged("ToolTipMsg")
+         NotifyPropertyChanged(NameOf(ToolTipMsg))
       Else
          ' lo rimetto nella lista utensili
          For Index = 0 To sh_ToolsList.Count - 1
@@ -566,7 +566,7 @@ Public Class ExitToolAssociation
 
          ' seleziono utensile rimesso in lista
          m_Tool.IsSelected = True
-         Tool.NotifyPropertyChanged("IsSelected")
+         Tool.NotifyPropertyChanged(NameOf(ToolItem.IsSelected))
          ' e lo tolgo dalla posizione di attrezzaggio
          Tool = Nothing
          IsOccupied = False
@@ -648,7 +648,7 @@ Public Class FamilyToolItem
             m_HaveToolsInCurrMachGroup = True
          End If
       Next
-      NotifyPropertyChanged("FamilyColor")
+      NotifyPropertyChanged(NameOf(FamilyColor))
    End Sub
 
 End Class
diff --git a/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpVM.vb b/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpVM.vb
index 61b67f03..79af4a53 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SetUp/SetUpVM.vb
@@ -169,7 +169,7 @@ Public Class SetUpVM
       ' Se esiste almeno una famiglia di utensili, la seleziono
       If ToolsList.Count > 0 Then
          ToolsList(0).IsSelected = True
-         ToolsList(0).NotifyPropertyChanged("IsSelected")
+         ToolsList(0).NotifyPropertyChanged(NameOf(FamilyToolItem.IsSelected))
       End If
       Return True
    End Function
@@ -225,7 +225,7 @@ Public Class SetUpVM
       ' Se esiste almeno una famiglia di utensili, la seleziono
       If ToolsList.Count > 0 Then
          ToolsList(0).IsSelected = True
-         ToolsList(0).NotifyPropertyChanged("IsSelected")
+         ToolsList(0).NotifyPropertyChanged(NameOf(FamilyToolItem.IsSelected))
       End If
    End Sub
 
@@ -427,7 +427,7 @@ Public Class SetUpVM
                                     ' vi metto l'utensile e segno l'uscita come occupata
                                     CurrExitToolAss.SetTool(TempTool)
                                     CurrExitToolAss.IsOccupied = True
-                                    CurrExitToolAss.NotifyPropertyChanged("ToolTipMsg")
+                                    CurrExitToolAss.NotifyPropertyChanged(NameOf(ToolItem.ToolTipMsg))
                                     ' lo metto anche come utensile originale
                                     If bOriginal Then CurrExitToolAss.OrigTool = TempTool
                                     Exit For
@@ -659,7 +659,7 @@ Public Class SetUpVM
          If ExitIndex = nExit - 1 Then
             Position.ExitToolAssociationList(ExitIndex).Tool = SelTool
             Position.ExitToolAssociationList(ExitIndex).IsOccupied = True
-            Position.ExitToolAssociationList(ExitIndex).NotifyPropertyChanged("ToolTipMsg")
+            Position.ExitToolAssociationList(ExitIndex).NotifyPropertyChanged(NameOf(ToolItem.ToolTipMsg))
             bOk = True
             Exit For
          End If
@@ -743,7 +743,7 @@ Public Class SetUpVM
          Next
       Next
       m_IsEnabledApplyBtn = False
-      NotifyPropertyChanged("IsEnabledApplyBtn")
+      NotifyPropertyChanged(NameOf(IsEnabledApplyBtn))
       ' aggiorno le librerie sottostanti
       EgtUpdateCurrSetup()
    End Sub
diff --git a/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
index 1cd4ff32..6dd3b530 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ShowBeamPanel/ShowBeamPanelVM.vb
@@ -19,7 +19,6 @@ Public Class ShowBeamPanelVM
             m_ShowBuilding_IsEnabled = Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.BTLStructureM.nAsseBaseId <> GDB_ID.NULL
          Else
             m_ShowSolid_IsEnabled = True
-            'm_ShowSolid_IsEnabled = Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE
             m_ShowBuilding_IsEnabled = False
          End If
          UpdatePartBtnIsEnabled()
diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/TreeViewItemBase.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/TreeViewItemBase.vb
index 4fd2dc75..5bf97e42 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Utility/TreeViewItemBase.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Utility/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/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb
index 251a4a84..b801e321 100644
--- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb
@@ -929,7 +929,7 @@ Public Class WarehouseWndVM
                m_RemovedParamsCount += 1
                If SParamList.Count > 0 Then
                   SelCurrentS = SParamList(0)
-                  NotifyPropertyChanged("SelCurrentS")
+                  NotifyPropertyChanged(NameOf(SelCurrentS))
                End If
             End If
             Return