diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
index 48f6b7da..af962d09 100644
--- a/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb
@@ -66,8 +66,12 @@ Public Class BTLStructureVM
       End Get
    End Property
    Friend Sub SetSelectionType(value As SelectionTypes)
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
+         ' resetto gruppo di lavorazione corrente
+         EgtResetCurrMachGroup()
+      End If
       m_PrevSelectionType = m_SelectionType
-      If value = m_SelectionType Then Return
+      If value = m_SelectionType And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Then Return
       m_SelectionType = value
       Select Case m_SelectionType
          Case SelectionTypes.SELECT_
@@ -91,7 +95,7 @@ Public Class BTLStructureVM
             ' mostro pezzi selezionati
             Map.refProjectVM.BTLStructureVM.ShowAll(False)
             ' se attivata opzione, li assemblo
-            Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
+            Map.refProjectVM.BTLStructureVM.ShowBuilding(If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Map.refShowBeamPanelVM.ShowBuilding_IsChecked, False), False)
             ' nascondo barra di gestione pezzo
             Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
       End Select
@@ -149,11 +153,15 @@ Public Class BTLStructureVM
    End Sub
 
    Private Sub SelBTLParts_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
+         ' resetto gruppo di lavorazione corrente
+         EgtResetCurrMachGroup()
+      End If
       If m_bOnlySelectItem Then Return
       Select Case e.Action
          Case NotifyCollectionChangedAction.Add
             If e.NewItems.Count > 0 AndAlso Not IsNothing(e.NewItems(0)) Then
-               If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+               If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_SelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                   SelectBTLPart(e.NewItems(0))
                Else     ' SelectionTypes.HIGHLIGHT
                   HighlightBTLPart(e.NewItems(0))
@@ -161,14 +169,14 @@ Public Class BTLStructureVM
             End If
          Case NotifyCollectionChangedAction.Remove
             If e.OldItems.Count > 0 AndAlso Not IsNothing(e.OldItems(0)) Then
-               If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+               If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                   DeselectBTLPart(e.OldItems(0))
                Else     ' SelectionTypes.HIGHLIGHT
                   DeHighlightBTLPart(e.OldItems(0))
                End If
             End If
          Case NotifyCollectionChangedAction.Reset
-            If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+            If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso m_PrevSelectionType = SelectionTypes.SELECT_) OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                If Not IsNothing(m_SelBTLPart) Then
                   DeselectBTLPart(m_SelBTLPart)
                End If
@@ -185,10 +193,10 @@ Public Class BTLStructureVM
    End Sub
 
    Private Sub SelectBTLPart(BtlPart As BTLPartVM)
-      EgtBeamShowFacesName(False)
-      EgtBeamShowLoadingSide(False, False)
       m_SelBTLPart = BtlPart
-      If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+         EgtBeamShowFacesName(False)
+         EgtBeamShowLoadingSide(False, False)
          Map.refProjectVM.MacroFeature_IsEnabled = True
          ' se modalità building, la tolgo
          If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
@@ -210,13 +218,15 @@ Public Class BTLStructureVM
          'Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
          ' deseleziono le feature
          If Not IsNothing(BtlPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
-            ' aggiorno stato selezionato tutto
-            Map.refShowBeamPanelVM.bShowAll = False
-            Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-            EgtZoom(ZM.ALL)
-         ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-            ' resetto gruppo di lavorazione corrente
-            EgtResetCurrMachGroup()
+         ' aggiorno stato selezionato tutto
+         Map.refShowBeamPanelVM.bShowAll = False
+         Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
+         EgtZoom(ZM.ALL)
+      ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
+         ' resetto gruppo di lavorazione corrente
+         EgtResetCurrMachGroup()
+         EgtBeamShowFacesName(False)
+         EgtBeamShowLoadingSide(False, False)
          ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
          If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
             Dim MachGroupList As New List(Of MyMachGroupVM)
@@ -241,6 +251,52 @@ Public Class BTLStructureVM
          SceneSelPartSelection()
          Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
          EgtZoom(ZM.ALL)
+      ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+         If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
+            ' resetto gruppo di lavorazione corrente
+            EgtResetCurrMachGroup()
+         End If
+         EgtBeamShowFacesName(False)
+         EgtBeamShowLoadingSide(False, False)
+         Map.refProjectVM.MacroFeature_IsEnabled = True
+         ' se modalità building, la tolgo
+         If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
+            ShowBuilding(False, False)
+         End If
+         ' seleziono pezzo nella scena
+         SceneSelPartSelection()
+         ' seleziono pezzo in Db geometrico
+         EgtBeamSetPart(BtlPart.nPartId)
+         EgtBeamShowFacesName(True)
+         Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
+         Dim bLeftToRight As Boolean = Not (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
+         EgtBeamShowLoadingSide(bLoadingSideShow, bLeftToRight)
+         ' deseleziono le feature
+         If Not IsNothing(BtlPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
+         ' aggiorno stato selezionato tutto
+         Map.refShowBeamPanelVM.bShowAll = False
+         ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
+         If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+            Dim MachGroupList As New List(Of MyMachGroupVM)
+            For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
+               Dim bFound As Boolean = False
+               For Each Part As PartVM In Machgroup.PartVMList
+                  If EgtDuploGetOriginal(Part.nPartId) = BtlPart.nPartId Then
+                     Part.SetSearchFound()
+                     bFound = True
+                  Else
+                     Part.ResetSearchFound()
+                  End If
+               Next
+               If bFound Then
+                  Machgroup.SetSearchFound()
+               Else
+                  Machgroup.ResetSearchFound()
+               End If
+            Next
+         End If
+         Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
+         EgtZoom(ZM.ALL)
       End If
       NotifyPropertyChanged(NameOf(SelBTLPart))
    End Sub
@@ -278,7 +334,7 @@ Public Class BTLStructureVM
          End While
       End If
       ' seleziono pagina BottomPanel
-      Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
+      If Not IsNothing(Map.refBottomPanelVM) Then Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.NULL)
       EgtDraw()
    End Sub
    Private Sub DeHighlightBTLPart(BtlPart As BTLPartVM, Optional bDraw As Boolean = True)
@@ -314,6 +370,10 @@ Public Class BTLStructureVM
          Return m_SelBTLPart
       End Get
       Set(value As BTLPartVM)
+         If Map.refMainMenuVM.SelPage = Pages.MACHINING Or (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) Then
+            ' resetto gruppo di lavorazione corrente
+            EgtResetCurrMachGroup()
+         End If
          If Not IsNothing(m_SelBTLPart) Then
             ' se necessario tolgo solido dal precedentemente selezionato
             If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
@@ -345,8 +405,6 @@ Public Class BTLStructureVM
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
             ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-               ' resetto gruppo di lavorazione corrente
-               EgtResetCurrMachGroup()
                ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
                If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
                   Dim MachGroupList As New List(Of MyMachGroupVM)
@@ -371,6 +429,45 @@ Public Class BTLStructureVM
                SceneSelPartSelection()
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
+            ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
+               ' se modalità building, la tolgo
+               If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
+                  ShowBuilding(False, False)
+               End If
+               ' seleziono pezzo nella scena
+               SceneSelPartSelection()
+               ' seleziono pezzo in Db geometrico
+               EgtBeamSetPart(m_SelBTLPart.nPartId)
+               ' seleziono pagina BottomPanel
+               Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
+               ' mostro barra di gestione pezzo
+               Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
+               ' deseleziono le feature
+               If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
+               ' aggiorno stato selezionato tutto
+               Map.refShowBeamPanelVM.bShowAll = False
+               ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
+               If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+                  Dim MachGroupList As New List(Of MyMachGroupVM)
+                  For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
+                     Dim bFound As Boolean = False
+                     For Each Part As PartVM In Machgroup.PartVMList
+                        If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
+                           Part.SetSearchFound()
+                           bFound = True
+                        Else
+                           Part.ResetSearchFound()
+                        End If
+                     Next
+                     If bFound Then
+                        Machgroup.SetSearchFound()
+                     Else
+                        Machgroup.ResetSearchFound()
+                     End If
+                  Next
+               End If
+               Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
+               EgtZoom(ZM.ALL)
             End If
          End If
          NotifyPropertyChanged(NameOf(SelBTLPart))
@@ -1336,7 +1433,7 @@ Public Class BTLStructureVM
    End Property
 
    Public Sub DeletePart()
-      If Map.refMainMenuVM.SelPage = Pages.VIEW Then Map.refLeftPanelVM.RemovePartCmd()
+      If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refLeftPanelVM.RemovePartCmd()
    End Sub
 
 #End Region ' DeletePart
diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
index 9e6a9191..db68854f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml.vb
@@ -85,6 +85,8 @@ Public Class BTLPartListV
          '   m_MainWindowVM.SetMouseButton("Highlight")
          'End If
       End If
+      ' imposto tipo di grid selezionata
+      If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
    End Sub
 
    Public Shared Function FindVisualParent(Of T As DependencyObject)(ByVal child As DependencyObject) As T
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
index e934198f..04151e11 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb
@@ -22,12 +22,12 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property ViewPage_Visibility As Visibility
       Get
-         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
    Public ReadOnly Property MachiningPage_Visibility As Visibility
       Get
-         Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainMenuVM.SelPage = Pages.MACHINING, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
index e256301b..4d4c074c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/LeftPanel/OnlyProdLeftPanelV.xaml
@@ -82,70 +82,60 @@
       <StackPanel Orientation="Horizontal"
                   HorizontalAlignment="Right">
          <Button Command="{Binding NewRawPart_Command}"
-                 Visibility="{Binding MachiningPage_Visibility}"
                  ToolTip="{Binding NewRawPart_ToolTip}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding NewRawPartLast_Command}"        
-                 Visibility="{Binding MachiningPage_Visibility}"
                  ToolTip="{Binding NewRawPartLast_ToolTip}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/NewRawPartAuto.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding AddToRawPart_Command}"
-                 Visibility="{Binding MachiningPage_Visibility}"
                  ToolTip="{Binding AddToRawPart_ToolTip}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/AddToRawPart.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding CopyPart_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding CopyPart_ToolTip}"
                  IsEnabled="{Binding CopyPart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding AddPart_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding AddPart_ToolTip}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/AddPart.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding RemovePart_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding RemovePart_ToolTip}"
                  IsEnabled="{Binding RemovePart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/RemovePart.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding Invert_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding InvertSx_ToolTip}"
                  IsEnabled="{Binding RotatePart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/PartManager/LeftInvert.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding Invert_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding InvertDx_ToolTip}"
                  IsEnabled="{Binding RotatePart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding BackRotation_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding BackRotation_ToolTip}"
                  IsEnabled="{Binding RotatePart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/PartManager/LeftRotate.png" Stretch="Uniform"/>
          </Button>
          <Button Command="{Binding ForwardRotation_Command}"
-                 Visibility="{Binding ViewPage_Visibility}"
                  ToolTip="{Binding ForwardRotation_ToolTip}"
                  IsEnabled="{Binding RotatePart_IsEnabled}"
                  Style="{StaticResource LeftPanel_Button}">
diff --git a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
index 512042b1..1e3760e6 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
@@ -22,6 +22,8 @@ Public Class MyMachGroupPanelVM
             OnPostSetCurrMachGroup()
          End If
          NotifyPropertyChanged(NameOf(SelectedMachGroup))
+         ' imposto tipo di grid selezionata
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
       End Set
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
index 5f8b2911..1b1cd0ac 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
@@ -25,7 +25,7 @@ Public Class MainMenuVM
    Private m_SendFeedbackIsEnabled As Boolean = True
    Public ReadOnly Property SendFeedbackIsEnabled As Boolean
       Get
-         Return m_SelPage = Pages.VIEW Or m_SelPage = Pages.MACHINING
+         Return m_SelPage = Pages.VIEW Or m_SelPage = Pages.MACHINING Or m_SelPage = Pages.ONLYPRODPAGE
       End Get
    End Property
 
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index 2cf306b7..d56c6bb0 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
@@ -170,7 +170,11 @@ Public Class MainWindowVM
       If ProcessCommandLine(nCommandType, nPage, nProdId) Then
          Select Case nCommandType
             Case 1
-               Map.refProdManagerVM.SetCurrProd(nProdId)
+               If Map.refMainWindowVM.MainWindowM.bOnlyProd Then
+                  Map.refOnlyProdManagerVM.SetCurrProd(nProdId)
+               Else
+                  Map.refProdManagerVM.SetCurrProd(nProdId)
+               End If
             Case 2
                ' pagina gia' impostata nella variabile
          End Select
diff --git a/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
index 039ff8f9..8b55132d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OnlyProdManager/OnlyProdManagerVM.vb
@@ -72,14 +72,15 @@ Public Class OnlyProdManagerVM
       Get
          Dim IdAndBTLFileNames As New ObservableCollection(Of String)
          For Each FileName In m_MruFiles.FileNames.ToList()
-            Dim PjId As Integer = 0
-            Dim sPjId As String = Path.GetFileNameWithoutExtension(DirectCast(FileName, String).Replace("__", "_"))
-            Integer.TryParse(sPjId, PjId)
-            Dim PjFileM = DbControllers.m_ProjController.FindByProjIdConv(PjId)
-            If IsNothing(PjFileM) Then
+            Dim PdId As Integer = 0
+            Dim sPdId As String = Path.GetFileNameWithoutExtension(DirectCast(FileName, String).Replace("__", "_"))
+            Integer.TryParse(sPdId, PdId)
+            Dim PdFileM = DbControllers.m_ProdController.FindCoreByProdId(PdId)
+            If IsNothing(PdFileM) Then
                m_MruFiles.Remove(FileName)
             Else
-               IdAndBTLFileNames.Add(sPjId & " | " & PjFileM.sBTLFileName)
+               Dim PdFileVM = New ProdFileVM(PdFileM)
+               IdAndBTLFileNames.Add(sPdId & " | " & PdFileVM.sBTLFileName)
             End If
          Next
          Return IdAndBTLFileNames
@@ -133,6 +134,7 @@ Public Class OnlyProdManagerVM
    ' Definizione comandi
    Private m_cmdNew As ICommand
    Private m_cmdOpen As ICommand
+   Private m_cmdOpenMruFile As ICommand
    Private m_cmdSave As ICommand
    Private m_cmdImportBTL As ICommand
    Private m_cmdUpdateBTL As ICommand
@@ -241,7 +243,7 @@ Public Class OnlyProdManagerVM
       Return SetCurrProj(CurrProj.nProjId)
    End Function
 
-   Private Function InitNewProject(ByRef nProjId As Integer, ByRef sProjectDir As String, nType As BWType, Machine As Machine) As Boolean
+   Private Function InitNewProj(ByRef nProjId As Integer, ByRef sProjectDir As String, nType As BWType, Machine As Machine) As Boolean
       ' se non ho ricevuto numero progetto da sovrascrivere
       If nProjId = 0 Then
          ' richiedo indice nuovo progetto
@@ -269,7 +271,7 @@ Public Class OnlyProdManagerVM
       Return True
    End Function
 
-   Friend Function InitNewProjectPROD(ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sProjectDir As String) As Boolean
+   Friend Function InitNewProd(ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sProjectDir As String) As Boolean
       ' richiedo indice nuovo progetto
       nProdId = DbControllers.m_ProdController.GetNextIndex(nProjId, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
       If nProdId <= 0 Then Return False
@@ -290,7 +292,7 @@ Public Class OnlyProdManagerVM
    End Function
 
    Private Sub ReloadBTLStructure()
-      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(Map.refOnlyProdManagerVM.CurrProd.nProdId))
+      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(CurrProj.nProjId))
       ' verifico se volume pezzi calcolato
       Dim bIsCalculated As Boolean = False
       For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
@@ -328,11 +330,11 @@ Public Class OnlyProdManagerVM
             ' verifico se progetto modificato, e chiedo se salvare
             If Not ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ) Then Return
             LoadingWndHelper.OpenLoadingWnd(ActiveIds.GOTOPROD, 3, EgtMsg(63004), EgtMsg(63011), 10)          ' Optimization opening      ' Loading environment
-            If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso (m_nProjIdToOpen <> Map.refProjManagerVM.CurrProj.nProdId OrElse IsNothing(Map.refProdManagerVM.CurrProd)) Then
-               Map.refProdManagerVM.SetCurrProd(m_nProjIdToOpen)
-               Map.refProdManagerVM.CurrProd.SetReloadProject(True)
+            If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso (m_nProjIdToOpen <> Map.refProjManagerVM.CurrProj.nProdId OrElse IsNothing(CurrProd)) Then
+               SetCurrProd(m_nProjIdToOpen)
+               CurrProd.SetReloadProject(True)
             Else
-               Map.refProdManagerVM.CurrProd.SetReloadProject(False)
+               CurrProd.SetReloadProject(False)
             End If
             ' Ricavo il tipo di Warehouse settato nell'INI
             Dim nDefault As Integer = 2
@@ -349,11 +351,18 @@ Public Class OnlyProdManagerVM
       m_nProjIdToOpen = GDB_ID.NULL
    End Sub
 
-   Private Sub InitProd()
+   Public Sub OpenProjectFromSupervisor(ProjIdToOpen As Integer)
+      If (Not IsNothing(m_CurrProd) AndAlso ProjIdToOpen <> m_CurrProd.nProdId) OrElse Map.refMainMenuVM.SelPage <> Pages.ONLYPRODPAGE Then
+         m_nProjIdToOpen = ProjIdToOpen
+         m_bOpenProj = True
+      End If
+   End Sub
+
+   Private Sub NewProdFromProj()
       ' inizializzo nuovo progetto PROD
       Dim nProdId As Integer = 0
       Dim sProdDir As String = ""
-      InitNewProjectPROD(m_CurrProj.nProjId, nProdId, sProdDir)
+      InitNewProd(m_CurrProj.nProjId, nProdId, sProdDir)
       ' setto il PType del Prod
       DbControllers.m_ProdController.UpdatePType(nProdId, CurrProj.nType)
       ' setto la Macchina associata al Prod
@@ -374,17 +383,23 @@ Public Class OnlyProdManagerVM
       End If
       If bOk Then
          ' aggiorno path proj
-         Map.refOnlyProdManagerVM.UpdateCurrProj()
+         UpdateCurrProj()
          ' imposto currprod
-         Map.refOnlyProdManagerVM.SetCurrProd(nProdId)
+         SetCurrProd(nProdId)
          ' imposto TempCurrProd
-         Map.refOnlyProdManagerVM.TempCurrProd = Map.refOnlyProdManagerVM.CurrProd
+         TempCurrProd = CurrProd
          ' setto flag nuovo progetto in prod
-         Map.refOnlyProdManagerVM.CurrProd.bIsNew = True
+         CurrProd.bIsNew = True
       Else
          ' elimino da DB
          DbControllers.m_ProdController.DeleteProd(nProdId, True)
       End If
+      ' Ricavo il tipo di Warehouse settato nell'INI
+      Dim nDefault As Integer = 2
+      If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM Then
+         ' Se di tipo Medium confronto le Sezioni del BTL importato con quelle in Warehouse
+         WarehouseWndVM.UpdateSectionXMaterial()
+      End If
    End Sub
 
    Private Sub ManageImportLog(nProjId As Integer, sProjDir As String)
@@ -483,7 +498,7 @@ Public Class OnlyProdManagerVM
          ' inizializzo nuovo progetto PROJ
          Dim nProjId As Integer = 0
          Dim sProjDir As String = ""
-         InitNewProject(nProjId, sProjDir, nType, Machine)
+         InitNewProj(nProjId, sProjDir, nType, Machine)
          SetCurrProj(nProjId)
          ' carico lista macchine e macchina del progetto per il pulsante Reset Macchina del CALCPanel
          Map.refCALCPanelVM.LoadMachineList()
@@ -512,7 +527,7 @@ Public Class OnlyProdManagerVM
          End If
          Map.refProjectVM.SetOptimizePanel_Visibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO))
          ' inizializzo nuovo progetto PROD
-         InitProd()
+         NewProdFromProj()
       Else
          MessageBox.Show(EgtMsg(61876))
       End If
@@ -575,11 +590,11 @@ Public Class OnlyProdManagerVM
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63004), EgtMsg(63001), 50)          ' Optimization opening     ' Loading project geometries
       If File.Exists(sFilePath) Then
          ' se la macchina del progetto in apertura non è tra le macchine disponibili lo segnalo e apro un progetto vuoto
-         If IsNothing(Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refOnlyProdManagerVM.TempCurrProd.sMachine)) Then
+         If IsNothing(Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = TempCurrProd.sMachine)) Then
             ' rimuovo il file in apertura dalla lista degli MRU
-            Map.refOnlyProdManagerVM.m_MruFiles.Remove(sFilePath)
+            m_MruFiles.Remove(sFilePath)
             MessageBox.Show(EgtMsg(61885), EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
-            Map.refOnlyProdManagerVM.NewProject()
+            NewProject()
             Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
          Else
             If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
@@ -610,6 +625,37 @@ Public Class OnlyProdManagerVM
 
 #End Region ' OpenCommand
 
+#Region "OpenMruFileCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property OpenMruFileCommand As ICommand
+      Get
+         If m_cmdOpenMruFile Is Nothing Then
+            m_cmdOpenMruFile = New Command(AddressOf OpenMruFile)
+         End If
+         Return m_cmdOpenMruFile
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Public Sub OpenMruFile(ByVal param As Object)
+      ' verifico se progetto modificato, e chiedo se salvare
+      If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return
+      ' ricavo l'Id e il progetto associato per l'apertura di quest'ultimo
+      Dim PdId As Integer = 0
+      Dim arrStrPdId As String() = DirectCast(param, String).Split("|")
+      Integer.TryParse(arrStrPdId(0), PdId)
+      Dim PdFileM = DbControllers.m_ProdController.FindCoreByProdId(PdId)
+      Dim PdFileVM = New ProdFileVM(PdFileM)
+      OpenProject(PdFileVM)
+   End Sub
+
+#End Region ' OpenMruFileCommand
+
 #Region "SaveCommand"
 
    ''' <summary>
@@ -649,15 +695,15 @@ Public Class OnlyProdManagerVM
       End If
       ' verifico se Reset Macchina modificato e nel caso aggiorno DB e CurrProj
       If Map.refCALCPanelVM.IsMachineModified() Then
-         DbControllers.m_ProdController.UpdateMachine(Map.refOnlyProdManagerVM.CurrProd.nProdId, Map.refCALCPanelVM.SelectedMachine.Name)
-         Map.refOnlyProdManagerVM.CurrProd.SetMachine(Map.refCALCPanelVM.SelectedMachine.Name)
+         DbControllers.m_ProdController.UpdateMachine(CurrProd.nProdId, Map.refCALCPanelVM.SelectedMachine.Name)
+         CurrProd.SetMachine(Map.refCALCPanelVM.SelectedMachine.Name)
          ' ciclo sulla lista di ProjId associati
-         For Each ProjId In Map.refOnlyProdManagerVM.CurrProd.nProjIdList
+         For Each ProjId In CurrProd.nProjIdList
             ' aggiorno la Macchina per i ProjId associati sul DB
             DbControllers.m_ProjController.UpdateMachine(ProjId, Map.refCALCPanelVM.SelectedMachine.Name)
             ' se uno dei Proj interessati equivale al Proj correntemente aperto setto la Macchina dello stesso
             ' (poichè il progetto corrente non viene riaperto e riletto dal DB)
-            If ProjId = Map.refOnlyProdManagerVM.CurrProj.nProjId Then Map.refOnlyProdManagerVM.CurrProj.SetMachine(Map.refCALCPanelVM.SelectedMachine.Name)
+            If ProjId = CurrProj.nProjId Then CurrProj.SetMachine(Map.refCALCPanelVM.SelectedMachine.Name)
          Next
          Map.refCALCPanelVM.ResetMachineModified()
       End If
@@ -693,8 +739,8 @@ Public Class OnlyProdManagerVM
    ''' Execute the ImportBTL.  This method is invoked by the ImportBTLCommand.
    ''' </summary>
    Public Sub ImportBTL(Optional sFile As String = "", Optional bWithDlg As Boolean = True)
-      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
-      'If Not ProdFileVM.VerifyProjectModification(CurrProd) Then Return
+      'If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      If Not ProdFileVM.VerifyProjectModification(CurrProd) Then Return
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
       If bWithDlg Then
@@ -764,7 +810,7 @@ Public Class OnlyProdManagerVM
       End If
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.IMPORTBTL, 3, EgtMsg(63008), EgtMsg(63009), 50)           ' BTL file importing     ' Reading BTL file
       ' inizializzo nuovo progetto
-      InitNewProject(nProjId, sProjDir, nType, Machine)
+      InitNewProj(nProjId, sProjDir, nType, Machine)
       SetCurrProj(nProjId)
       ' imposto il tipo di parametri Q da utilizzare
       BTLIniFile.m_nBTLBWType = nType
@@ -835,8 +881,10 @@ Public Class OnlyProdManagerVM
          ' CheckMe impostata come cancellazione FISICA dal DB...
          DbControllers.m_ProjController.DeleteProj(nProjId, False)
       End If
-      ' inizializzo nuovo progetto PROD
-      InitProd()
+      If bOk Then
+         ' inizializzo nuovo progetto PROD
+         NewProdFromProj()
+      End If
       ' carico filtri di ricerca
       Map.refProjectVM.BTLStructureVM.LoadFilters()
       ' gestisco log di importazione
@@ -933,7 +981,7 @@ Public Class OnlyProdManagerVM
       ' setto il flag per inizializzazione gestore travi e pareti per importare progetto
       Dim nFlag As Integer
       Dim sBTLFlag As String
-      If Map.refOnlyProdManagerVM.nProdType = Core.ConstBeam.BWType.BEAM Then
+      If nProdType = Core.ConstBeam.BWType.BEAM Then
          sBTLFlag = K_BTLFLAG
       Else
          sBTLFlag = K_WALLBTLFLAG
@@ -1274,7 +1322,7 @@ Public Class OnlyProdManagerVM
                   Dim nAsseBaseToEraseId As Integer = 0
                   EgtGetInfo(nAsseBaseId, BTL_PRT_PROJ, nAsseBaseProjId)
                   ' se AsseBase di questo step del ciclo è nuovo e suo ProjId uguale a quello del progetto corrente
-                  If Not AsseBaseIdList.Contains(nAsseBaseId) AndAlso nAsseBaseProjId = Map.refOnlyProdManagerVM.CurrProd.nProdId Then
+                  If Not AsseBaseIdList.Contains(nAsseBaseId) AndAlso nAsseBaseProjId = CurrProd.nProdId Then
                      ' riloco i sottonodi del nuovo AsseBase nell'AsseBase del progetto aperto col medesimo ProjId
                      Dim AsseBaseSubNodeId As Integer = EgtGetFirstInGroup(nAsseBaseId)
                      While AsseBaseSubNodeId <> GDB_ID.NULL
@@ -1285,7 +1333,7 @@ Public Class OnlyProdManagerVM
                            EgtGetInfo(FindAsseBaseId, BTL_PRT_PROJ, SameAsseBaseProjId)
                            ' se l'ho trovato esco dal While (FindAsseBaseId è l'id dell'AsseBase in cui vogliamo rilocare i sottonodi)
                            'If SameAsseBaseProjId = Map.refProjManagerVM.CurrProj.nProjId Then Exit While
-                           If SameAsseBaseProjId = Map.refOnlyProdManagerVM.CurrProd.nProdId Then Exit While
+                           If SameAsseBaseProjId = CurrProd.nProdId Then Exit While
                            FindAsseBaseId = EgtGetNextName(FindAsseBaseId, ASSEBASE)
                         End While
                         ' salvo id dell'AsseBase corrente per ottenere il seguente prima di rilocarlo
@@ -1345,7 +1393,7 @@ Public Class OnlyProdManagerVM
          ' copio il file originale scelto nel dialog per l'Update nella cartella Proj del progetto corrente
          If File.Exists(sFile) Then
             'Dim sDestPath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & Path.GetFileNameWithoutExtension(sFile)
-            Dim sDestPath As String = Map.refOnlyProdManagerVM.CurrProd.sProdDirPath & "\" & Path.GetFileNameWithoutExtension(sFile)
+            Dim sDestPath As String = CurrProd.sProdDirPath & "\" & Path.GetFileNameWithoutExtension(sFile)
             While File.Exists(sDestPath & ".btl")
                sDestPath &= "_1"
             End While
@@ -1389,11 +1437,11 @@ Public Class OnlyProdManagerVM
             If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return Nothing
             If IsNothing(CurrProj) Then Return Nothing
          Case Pages.MACHINING
-            If ProdFileVM.VerifyProjectModification(Map.refProdManagerVM.CurrProd) = MessageBoxResult.Cancel Then Return Nothing
-            If IsNothing(Map.refProdManagerVM.CurrProd) Then Return Nothing
+            If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return Nothing
+            If IsNothing(CurrProd) Then Return Nothing
          Case Pages.ONLYPRODPAGE
-            If ProdFileVM.VerifyProjectModification(Map.refOnlyProdManagerVM.CurrProd) = MessageBoxResult.Cancel Then Return Nothing
-            If IsNothing(Map.refOnlyProdManagerVM.CurrProd) Then Return Nothing
+            If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return Nothing
+            If IsNothing(CurrProd) Then Return Nothing
          Case Else
             Return Nothing
       End Select
@@ -1409,7 +1457,7 @@ Public Class OnlyProdManagerVM
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.EXPORTPROJECT, 2, EgtMsg(63010), EgtMsg(63016), 30)           ' Project exporting     ' Adding export info
       ' se assemblato me lo segno e lo smonto
       Dim bShowBuilding As Boolean = False
-      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+      If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
          If Map.refShowBeamPanelVM.bShowAll Then
             ' verifico se assemblato e lo annullo per salvataggio
             bShowBuilding = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
@@ -1450,7 +1498,7 @@ Public Class OnlyProdManagerVM
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
             ' impacchetto tutta la cartella del progetto
-            Dim sProjectDirPath As String = If(CurrProd.nProdId > 0, CurrProd.sProdDirPath, CurrProj.sProjDirPath)
+            Dim sProjectDirPath As String = If(CurrProd.nProdId > 0, CurrProd.sProdDirPath, CurrProd.sProjDirPath)
             For Each sFile As String In Directory.GetFiles(sProjectDirPath)
                zip.AddItem(sFile, "")
             Next
@@ -1490,11 +1538,11 @@ Public Class OnlyProdManagerVM
    ''' Execute the Export.  This method is invoked by the ExportCommand.
    ''' </summary>
    Public Sub ImportProject()
-      Dim CurrProd As ProjectFileVM = Map.refOnlyProdManagerVM.CurrProd
+      Dim TempCurrProd As ProjectFileVM = m_CurrProd
       ' lista di tutti gli errori riscontrati
       Dim ErrorList As New List(Of String)
       'If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
-      If ProdFileVM.VerifyProjectModification(CurrProd) Then Return
+      If ProdFileVM.VerifyProjectModification(TempCurrProd) Then Return
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTNGEXPDIR, "", sDir)
       ' apro finestra scelta file
@@ -1579,7 +1627,7 @@ Public Class OnlyProdManagerVM
          ' inizializzo nuovo proj
          Dim nNewProjId As Integer = 0
          Dim sNewProjDir As String = ""
-         InitNewProject(nNewProjId, sNewProjDir, nType, Machine)
+         InitNewProj(nNewProjId, sNewProjDir, nType, Machine)
          NewProjIdList.Add(nNewProjId)
          ' imposto ProjId di caricamento
          m_nLoadingProjId = nImportProjId
@@ -1664,22 +1712,14 @@ Public Class OnlyProdManagerVM
             nDuploId = EgtGetNext(nDuploId)
          End While
          ' resetto CurrProd per evitare di leggere valori produzione dal Db di quel progetto
-         If Not IsNothing(Map.refProdManagerVM) Then
-            Map.refProdManagerVM.CurrProd = Nothing
-         ElseIf Not IsNothing(Map.refOnlyProdManagerVM) Then
-            Map.refOnlyProdManagerVM.CurrProd = Nothing
-         End If
+         CurrProd = Nothing
          ' carico Machgroup che non verrebbero altrimenti importati
          Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
          If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
             ' inizializzo nuovo progetto PROD
             Dim nProdId As Integer = 0
             Dim sProdDir As String = ""
-            If Not IsNothing(Map.refProdManagerVM) Then
-               Map.refProdManagerVM.InitNewProject(NewProjIdList(0), nProdId, sProdDir)
-            ElseIf Not IsNothing(Map.refOnlyProdManagerVM) Then
-               Map.refOnlyProdManagerVM.InitNewProjectPROD(NewProjIdList(0), nProdId, sProdDir)
-            End If
+            InitNewProd(NewProjIdList(0), nProdId, sProdDir)
             ' setto il PType del Prod
             DbControllers.m_ProdController.UpdatePType(nProdId, nType)
             ' setto la Macchina associata al Prod
@@ -1748,14 +1788,10 @@ Public Class OnlyProdManagerVM
       ' imposto progetto corrente
       If NewProjIdList.Count > 0 Then
          SetCurrProj(NewProjIdList(0))
-         OpenProject(CurrProd) ' Da controllare
+         OpenProject(TempCurrProd) ' Da controllare
       End If
       ' ripristino eventuale CurrProd precedente
-      If Not IsNothing(Map.refProdManagerVM) Then
-         Map.refProdManagerVM.CurrProd = CurrProd
-      ElseIf Not IsNothing(Map.refOnlyProdManagerVM) Then
-         Map.refOnlyProdManagerVM.CurrProd = CurrProd
-      End If
+      CurrProd = TempCurrProd
       WriteMainPrivateProfileString(S_GENERAL, K_LASTNGEXPDIR, Path.GetDirectoryName(ImportDlg.FileName))
       LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTPROJECT)
    End Sub
@@ -1792,7 +1828,7 @@ Public Class OnlyProdManagerVM
          Select Case VerifyResult
             Case MessageBoxResult.Yes, MessageBoxResult.OK
                ' salvo proj
-               Map.refOnlyProdManagerVM.Save()
+               Save()
             Case MessageBoxResult.Cancel
                Return
             Case Else   ' No
@@ -1892,7 +1928,7 @@ Public Class OnlyProdManagerVM
       End If
       ' mando richiesta di apertura progetto in supervisore
       'Dim x = DbControllers.m_StatusMapController.GetProd
-      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refOnlyProdManagerVM.CurrProd.nProdId, Map.refOnlyProdManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInSupervisorRequest, "")
+      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, CurrProd.nProdId, CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInSupervisorRequest, "")
    End Sub
 
 #End Region ' GoToSupervisor
diff --git a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
index 084ceb91..0dcb214a 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb
@@ -106,14 +106,7 @@ Public Class ProjectVM
    Private m_PartManager_Visibility As Boolean = True
    Public ReadOnly Property PartManager_Visibility As Visibility
       Get
-         'Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
-         If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive) Then
-            Return Visibility.Visible
-         ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-            Return Visibility.Visible
-         Else
-            Return Visibility.Collapsed
-         End If
+         Return If((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
@@ -280,6 +273,20 @@ Public Class ProjectVM
       End Set
    End Property
 
+   Enum GridSelTypes As Integer
+      PART = 1
+      MACHGROUP = 2
+   End Enum
+   Private m_LastSelGridType As GridSelTypes
+   Public ReadOnly Property LastSelGridType As GridSelTypes
+      Get
+         Return m_LastSelGridType
+      End Get
+   End Property
+   Friend Sub SetLastSelGridType(value As GridSelTypes)
+      m_LastSelGridType = value
+   End Sub
+
    ' Definizione Comandi
    Private m_cmdCopyFeature As ICommand
    Private m_cmdMacroFeature As ICommand
diff --git a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
index d50a1007..f480dadf 100644
--- a/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb
@@ -1,4 +1,5 @@
-Imports System.Windows.Interop
+
+Imports System.Windows.Interop
 Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -264,21 +265,21 @@ Public Class MySceneHostVM
    Private Sub OnMouseSetObjFilterForSelect(sender As Object, bZeroDim As Boolean, bCurve As Boolean,
                                             bSurf As Boolean, bVolume As Boolean, bExtra As Boolean)
       ' Se in modalità edit L250
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
          MainController.MouseSetObjFilterForSelect(bZeroDim, bCurve, bSurf, bVolume, bExtra)
       End If
    End Sub
 
    Private Sub OnMouseSelectedAll(ByVal sender As Object, bOnlyVisble As Boolean)
       ' Se in modalità edit L250
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
          MainController.MouseSelectedAll(bOnlyVisble)
       End If
    End Sub
 
    Private Sub OnMouseDeselectedAll(ByVal sender As Object)
       ' Se in modalità edit L250
-      If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refFreeContourManagerVM.bIsActive Then
          MainController.MouseDeselectedAll()
       End If
    End Sub
@@ -566,7 +567,7 @@ Public Class MySceneHostVM
             'Map.refMachinePanelVM.SelectedMachine = If(Not IsNothing(Map.refProdManagerVM.TempCurrProd),
             'Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProdManagerVM.TempCurrProd.sMachine),
             'Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProjManagerVM.CurrProj.sMachine))
-            If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+            If Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                Map.refMachinePanelVM.SelectedMachine = If(Not IsNothing(Map.refProdManagerVM.TempCurrProd),
                Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProdManagerVM.TempCurrProd.sMachine),
                Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = Map.refProjManagerVM.CurrProj.sMachine))
@@ -587,11 +588,11 @@ Public Class MySceneHostVM
             End If
             Map.refPartInRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.BTLStructureM.nPROJTYPE)
             If Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(Map.refProdManagerVM.TempCurrProd) Then
-               'Map.refProdManagerVM.CurrProd = Map.refProdManagerVM.TempCurrProd
                CurrProd = Map.refProdManagerVM.TempCurrProd
+               Map.refProdManagerVM.CurrProd = CurrProd
             ElseIf Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.TempCurrProd) Then
-               'Map.refFullCompleteManagerVM.CurrProd = Map.refFullCompleteManagerVM.TempCurrProd
                CurrProd = Map.refOnlyProdManagerVM.TempCurrProd
+               Map.refOnlyProdManagerVM.CurrProd = CurrProd
             End If
             'DbControllers.m_ProdController.LockByProdId(Map.refProdManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
             DbControllers.m_ProdController.LockByProdId(CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
@@ -621,9 +622,9 @@ Public Class MySceneHostVM
             '   Map.refProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
             'End If
             If CommIndex > -1 Then
-               If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
+               If Not IsNothing(Map.refProdManagerVM) AndAlso Not IsNothing(Map.refProdManagerVM.CurrProd) Then
                   Map.refProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
-               ElseIf Not IsNothing(Map.refOnlyProdManagerVM.CurrProd) Then
+               ElseIf Not IsNothing(Map.refOnlyProdManagerVM) AndAlso Not IsNothing(Map.refOnlyProdManagerVM.CurrProd) Then
                   Map.refOnlyProdManagerVM.CurrProd.SetModificationIndex(CommIndex)
                End If
             End If