diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
index 5698d3af..122d3816 100644
--- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
+++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj
@@ -99,7 +99,7 @@
     </Compile>
     <Compile Include="MyMachGroup.vb" />
     <Compile Include="Part.vb" />
-    <Compile Include="ProjectFile.vb" />
+    <Compile Include="ProjectFileM.vb" />
     <Compile Include="SectionXMaterial.vb" />
     <Compile Include="Utility\BTLIniFile.vb" />
     <Compile Include="Utility\Command.vb" />
diff --git a/EgtBEAMWALL.Core/ProjectFile.vb b/EgtBEAMWALL.Core/ProjectFile.vb
deleted file mode 100644
index ae1c21be..00000000
--- a/EgtBEAMWALL.Core/ProjectFile.vb
+++ /dev/null
@@ -1,74 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class ProjectFile
-
-   Protected m_nProjectType As ProjectType
-   Public ReadOnly Property nProjectType As ProjectType
-      Get
-         Return m_nProjectType
-      End Get
-   End Property
-   Public Sub SetProjectType(nProjectType As ProjectType)
-      m_nProjectType = nProjectType
-   End Sub
-
-   Protected m_nProjId As Integer = 0
-   Public ReadOnly Property nProjId As Integer
-      Get
-         Return m_nProjId
-      End Get
-   End Property
-
-   Protected m_nProdId As Integer = 0
-   Public ReadOnly Property nProdId As Integer
-      Get
-         Return m_nProdId
-      End Get
-   End Property
-
-   Protected m_BTLFileName As String = String.Empty
-   Public ReadOnly Property BTLFileName As String
-      Get
-         Return m_BTLFileName
-      End Get
-   End Property
-
-   Protected m_NewProj As Boolean
-   Public Property NewProj As Boolean
-      Get
-         Return m_NewProj
-      End Get
-      Set(value As Boolean)
-         m_NewProj = value
-      End Set
-   End Property
-
-   Protected m_NewProd As Boolean
-   Public Property NewProd As Boolean
-      Get
-         Return m_NewProd
-      End Get
-      Set(value As Boolean)
-         m_NewProd = value
-      End Set
-   End Property
-
-   ' temporaneo, per funzionamento vecchio senza db
-   Sub New()
-
-   End Sub
-
-   Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
-      m_nProjectType = nProjectType
-      If m_nProjectType = ProjectType.PROJ Then
-         m_nProjId = nProjId
-         m_nProdId = nProdId
-         m_BTLFileName = sBTLFileName
-      ElseIf m_nProjectType = ProjectType.PROD Then
-         m_nProdId = nProdId
-      End If
-   End Sub
-
-
-End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Core/ProjectFileM.vb b/EgtBEAMWALL.Core/ProjectFileM.vb
new file mode 100644
index 00000000..dc787e6f
--- /dev/null
+++ b/EgtBEAMWALL.Core/ProjectFileM.vb
@@ -0,0 +1,120 @@
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProjectFileM
+
+   Protected m_nProjectType As ProjectType
+   Public ReadOnly Property nProjectType As ProjectType
+      Get
+         Return m_nProjectType
+      End Get
+   End Property
+   Public Sub SetProjectType(nProjectType As ProjectType)
+      m_nProjectType = nProjectType
+   End Sub
+
+   Protected m_nProjId As Integer = 0
+   Public ReadOnly Property nProjId As Integer
+      Get
+         Return m_nProjId
+      End Get
+   End Property
+
+   Protected m_nProdId As Integer = 0
+   Public ReadOnly Property nProdId As Integer
+      Get
+         Return m_nProdId
+      End Get
+   End Property
+
+   Protected m_dtCreateDate As DateTime
+   Public ReadOnly Property dtCreateDate As DateTime
+      Get
+         Return m_dtCreateDate
+      End Get
+   End Property
+
+   Protected m_dtExportDate As DateTime
+   Public ReadOnly Property dtExportDate As DateTime
+      Get
+         Return m_dtExportDate
+      End Get
+   End Property
+
+   Protected m_sName As String
+   Public ReadOnly Property sName As String
+      Get
+         Return m_sName
+      End Get
+   End Property
+
+   Protected m_sBTLFileName As String = String.Empty
+   Public ReadOnly Property sBTLFileName As String
+      Get
+         Return m_sBTLFileName
+      End Get
+   End Property
+
+   Protected m_NewProj As Boolean
+   Public Property NewProj As Boolean
+      Get
+         Return m_NewProj
+      End Get
+      Set(value As Boolean)
+         m_NewProj = value
+      End Set
+   End Property
+
+   Protected m_NewProd As Boolean
+   Public Property NewProd As Boolean
+      Get
+         Return m_NewProd
+      End Get
+      Set(value As Boolean)
+         m_NewProd = value
+      End Set
+   End Property
+
+#Region "CONSTRUCTORS"
+
+   Protected Sub New()
+   End Sub
+
+   Public Shared Function CreateNewProjectFileM() As ProjectFileM
+      Return New ProjectFileM
+   End Function
+
+   Public Shared Function CreateProjectFileM(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer,
+                                             dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String,
+                                             sBTLFileName As String) As ProjectFileM
+      Dim NewProjectFileM As New ProjectFileM
+      NewProjectFileM.m_nProjectType = nProjectType
+      If NewProjectFileM.m_nProjectType = ProjectType.PROJ Then
+         NewProjectFileM.m_nProjId = nProjId
+         NewProjectFileM.m_nProdId = nProdId
+         NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+         NewProjectFileM.m_dtExportDate = dtExportDate
+         NewProjectFileM.m_sName = sListName
+         NewProjectFileM.m_sBTLFileName = sBTLFileName
+      ElseIf NewProjectFileM.nProjectType = ProjectType.PROD Then
+         NewProjectFileM.m_nProdId = nProdId
+         NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+         NewProjectFileM.m_sName = sListName
+      End If
+      Return NewProjectFileM
+   End Function
+
+   'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
+   '   m_nProjectType = nProjectType
+   '   If m_nProjectType = ProjectType.PROJ Then
+   '      m_nProjId = nProjId
+   '      m_nProdId = nProdId
+   '      m_BTLFileName = sBTLFileName
+   '   ElseIf m_nProjectType = ProjectType.PROD Then
+   '      m_nProdId = nProdId
+   '   End If
+   'End Sub
+
+#End Region    ' CONSTRUCTORS
+
+End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
index 24a33643..30b68810 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
@@ -272,14 +272,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="numRecord"></param>
         /// <returns></returns>
-        public List<Core.ProjectFile> GetLastDesc(int numRecord)
+        public List<Core.ProjectFileM> GetLastDesc(int numRecord)
         {
-            List<Core.ProjectFile> result = new List<Core.ProjectFile>();
+            List<Core.ProjectFileM> result = new List<Core.ProjectFileM>();
 
             var dbResult = GetLastDbModelDesc(numRecord);
 
             // conversione
-            result = dbResult.Select(x => new Core.ProjectFile(Core.ConstBeam.ProjectType.PROD, 0, x.ProdId, "")).ToList();
+            result = dbResult.Select(x => new Core.ProjectFileM(Core.ConstBeam.ProjectType.PROD, 0, x.ProdId, "")).ToList();
 
             return result;
         }
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
index ef55e5b9..caf2ee37 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
@@ -245,14 +245,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="numRecord"></param>
         /// <returns></returns>
-        public List<Core.ProjectFile> GetLastDesc(int numRecord)
+        public List<Core.ProjectFileM> GetLastDesc(int numRecord)
         {
-            List<Core.ProjectFile> result = new List<Core.ProjectFile>();
+            List<Core.ProjectFileM> result = new List<Core.ProjectFileM>();
 
             var dbResult = GetLastDbModelDesc(numRecord);
 
             // conversione
-            result = dbResult.Select(x => new Core.ProjectFile(Core.ConstBeam.ProjectType.PROJ, x.ProjId, ProdIdByProdDbId(x.ProdDbId), x.BTLFileName)).ToList();
+            result = dbResult.Select(x => new Core.ProjectFileM(Core.ConstBeam.ProjectType.PROJ, x.ProjId, ProdIdByProdDbId(x.ProdDbId), x.BTLFileName)).ToList();
 
             return result;
         }
diff --git a/EgtBEAMWALL.ViewerOptimizer/Constants/ConstBeam.vb b/EgtBEAMWALL.ViewerOptimizer/Constants/ConstBeam.vb
index 90786d04..03b52970 100644
--- a/EgtBEAMWALL.ViewerOptimizer/Constants/ConstBeam.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/Constants/ConstBeam.vb
@@ -105,12 +105,6 @@
    'Public Const S_GENERAL As String = "General"
    'Public Const K_DEBUG As String = "Debug"
 
-   ' Tipo di progetto
-   Public Enum ProjectType As Integer
-      PROJ = 1
-      PROD = 2
-   End Enum
-
    Friend Const PROJ As String = "PROJ"
    Friend Const FILENAMESEPARATOR As Char = "^"c
    Friend Const BTLINFO As String = "BtlInfo"
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index c35127ff..4b1c7e89 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -203,7 +203,7 @@
       <DependentUpon>ProdManagerV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ProdManager\ProdManagerVM.vb" />
-    <Compile Include="ProjectManager\ProjectFile.vb" />
+    <Compile Include="ProjectManager\ProjectFileVM.vb" />
     <Compile Include="Project\ProjectV.xaml.vb">
       <DependentUpon>ProjectV.xaml</DependentUpon>
     </Compile>
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
index a90848e3..46313630 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb
@@ -140,7 +140,7 @@ Public Class MainMenuVM
       Map.refProjectVM.SetProjManager_Visibility(False)
       Map.refProjectVM.SetProdManager_Visibility(True)
       ' verifico se progetto modificato, e chiedo se salvare
-      If bVerifyModification Then ProjectFile.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ)
+      If bVerifyModification Then ProjectFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ)
       Return True
    End Function
 
@@ -183,7 +183,7 @@ Public Class MainMenuVM
       Map.refProjectVM.SetProjManager_Visibility(True)
       Map.refProjectVM.SetProdManager_Visibility(False)
       ' verifico se progetto modificato, e chiedo se salvare
-      If bVerifyModification Then ProjectFile.VerifyProjectModification(Map.refProdManagerVM.CurrProd, ProjectType.PROD)
+      If bVerifyModification Then ProjectFileVM.VerifyProjectModification(Map.refProdManagerVM.CurrProd, ProjectType.PROD)
       EgtResetCurrMachGroup()
       Return True
    End Function
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index 5e3dda61..4c85cd08 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
@@ -59,6 +59,25 @@ Public Class MainWindowVM
       m_Title = sTitle
       NotifyPropertyChanged("Title")
    End Sub
+   Public Sub UpdateTitle()
+      Select Case Map.refMainMenuVM.SelPage
+         Case Pages.VIEW
+            If Map.refProjManagerVM.CurrProj.NewProj Then
+               m_Title = "New"
+            Else
+               m_Title = Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.BTLFileName
+            End If
+         Case Pages.MACHINING
+            If Map.refProdManagerVM.CurrProd.NewProd Then
+               m_Title = "New"
+            Else
+               m_Title = Map.refProdManagerVM.CurrProd.nProdId.ToString("0000")
+            End If
+         Case Pages.CONFIG
+            m_Title = "Configuration Page"
+      End Select
+      m_Title &= " - EgtBEAMWALL"
+   End Sub
 
    Friend Sub ContentRendered()
       ' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb
index 18f6be20..dd4d231c 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb
@@ -26,7 +26,7 @@ Public Class OpenProjectFileDialogV
       ' mostro la finestra di dialogo
       Return Me.ShowDialog()
    End Function
-   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFile)) As Boolean?
+   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()
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index 4bf1b6c2..b3cbe91e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -47,8 +47,8 @@ Public Class OpenProjectFileDialogVM
       End Get
    End Property
 
-   Private m_ProjectList As New List(Of ProjectFile)
-   Public ReadOnly Property ProjectList As List(Of ProjectFile)
+   Private m_ProjectList As New List(Of ProjectFileVM)
+   Public ReadOnly Property ProjectList As List(Of ProjectFileVM)
       Get
          Return m_ProjectList
       End Get
@@ -58,12 +58,12 @@ Public Class OpenProjectFileDialogVM
       'End Set
    End Property
 
-   Private m_SelProject As ProjectFile
-   Public Property SelProject As ProjectFile
+   Private m_SelProject As ProjectFileVM
+   Public Property SelProject As ProjectFileVM
       Get
          Return m_SelProject
       End Get
-      Set(value As ProjectFile)
+      Set(value As ProjectFileVM)
          m_SelProject = value
       End Set
    End Property
@@ -96,31 +96,19 @@ Public Class OpenProjectFileDialogVM
    ' Definizione comandi
    Private m_cmdProjectDoubleClick As ICommand
 
-   Public Function Init(ProjectType As ProjectType, Optional ProjectList As List(Of ProjectFile) = Nothing) As Boolean?
+   Public Function Init(ProjectType As ProjectType, Optional ProjectList As List(Of ProjectFileVM) = Nothing) As Boolean?
       m_ProjectType = ProjectType
       If IsNothing(ProjectList) OrElse ProjectList.Count = 0 Then
          ' leggo da db
-         Dim DbProjectList As New List(Of Core.ProjectFile)
+         Dim DbProjectList As New List(Of Core.ProjectFileM)
          If ProjectType = ProjectType.PROJ Then
             DbProjectList = DbControllers.m_ProjController.GetLastDesc(50)
          ElseIf ProjectType = ProjectType.PROD Then
             DbProjectList = DbControllers.m_ProdController.GetLastDesc(50)
          End If
          For Each Project In DbProjectList
-            m_ProjectList.Add(New ProjectFile(Project.nProjectType, Project.nProjId, Project.nProdId, Project.BTLFileName))
+            m_ProjectList.Add(New ProjectFileVM(Project))
          Next
-         '' cartella da cui leggere i programmi
-         'Dim sFolderPath As String
-         'If m_ProjectType = ProjectType.PROJ Then
-         '   sFolderPath = Map.refMainWindowVM.MainWindowM.sProjsDir
-         'Else
-         '   sFolderPath = Map.refMainWindowVM.MainWindowM.sProdsDir
-         'End If
-         '' leggo i file che contiene
-         'Dim AllDirsInDir As IEnumerable(Of String) = IO.Directory.EnumerateDirectories(sFolderPath)
-         'For Each CurrDirectory In AllDirsInDir
-         '   VerifyFiles(CurrDirectory)
-         'Next
       Else
          m_ProjectList = ProjectList
       End If
@@ -133,8 +121,8 @@ Public Class OpenProjectFileDialogVM
             Dim nProjId As Integer = 0
             Dim nProdId As Integer = 0
             Dim sBTLFileName As String = ""
-            If ProjectFile.VerifyProjectFile(m_ProjectType, Path.GetFileNameWithoutExtension(File), nProjId, nProdId, sBTLFileName) Then
-               m_ProjectList.Add(New ProjectFile(m_ProjectType, nProjId, nProdId, sBTLFileName))
+            If ProjectFileVM.VerifyProjectFile(m_ProjectType, Path.GetFileNameWithoutExtension(File), nProjId, nProdId, sBTLFileName) Then
+               m_ProjectList.Add(New ProjectFileVM(m_ProjectType, nProjId, nProdId, sBTLFileName))
             End If
          End If
       Next
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index 6d704aa5..ab8cfca0 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -8,12 +8,12 @@ Public Class ProdManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private m_CurrProd As ProjectFile
-   Friend Property CurrProd As ProjectFile
+   Private m_CurrProd As ProjectFileVM
+   Friend Property CurrProd As ProjectFileVM
       Get
          Return m_CurrProd
       End Get
-      Set(value As ProjectFile)
+      Set(value As ProjectFileVM)
          m_CurrProd = value
       End Set
    End Property
@@ -85,9 +85,9 @@ Public Class ProdManagerVM
 
    Friend Sub OpenProject(sFilePath As String)
       ' verifico se progetto modificato, e chiedo se salvare
-      ProjectFile.VerifyProjectModification(CurrProd, ProjectType.PROD)
+      ProjectFileVM.VerifyProjectModification(CurrProd, ProjectType.PROD)
       ' se la string è vuota
-      Dim TempCurrProd As ProjectFile
+      Dim TempCurrProd As ProjectFileVM
       Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
       If String.IsNullOrEmpty(sFilePath) Then
          ' apro dialogo di scelta file
@@ -101,8 +101,8 @@ Public Class ProdManagerVM
          Dim nProjId As Integer = 0
          Dim nProdId As Integer = 0
          Dim sBTLFileName As String = ""
-         If ProjectFile.VerifyProjectFile(ProjectType.PROD, Path.GetFileNameWithoutExtension(sFilePath), nProjId, nProdId, sBTLFileName) Then
-            TempCurrProd = New ProjectFile(ProjectType.PROD, nProjId, nProdId, sBTLFileName)
+         If ProjectFileVM.VerifyProjectFile(ProjectType.PROD, Path.GetFileNameWithoutExtension(sFilePath), nProjId, nProdId, sBTLFileName) Then
+            TempCurrProd = New ProjectFileVM(ProjectType.PROD, nProjId, nProdId, sBTLFileName)
          Else
             MessageBox.Show("Error in file name!!")
             Return
@@ -196,7 +196,7 @@ Public Class ProdManagerVM
    ''' </summary>
    Friend Sub GoToProj()
       ' verifico se salvare progetto corrente
-      ProjectFile.VerifyProjectModification(Map.refProdManagerVM.CurrProd, ProjectType.PROD)
+      ProjectFileVM.VerifyProjectModification(Map.refProdManagerVM.CurrProd, ProjectType.PROD)
       ' recupero Proj associato da Db
       Dim DbProjList As List(Of DataLayer.DatabaseModels.ProjModel) = DbControllers.m_ProjController.GetByProdAsc(m_CurrProd.nProdId)
       Dim nProjId As Integer = 0
@@ -241,7 +241,7 @@ Public Class ProdManagerVM
       '   Proj = ProjList(0)
       'End If
       ' apro progetto proj
-      Map.refProjManagerVM.CurrProj = New ProjectFile(ProjectType.PROJ, nProjId, m_CurrProd.nProdId, sBTLFileName)
+      Map.refProjManagerVM.CurrProj = New ProjectFileVM(ProjectType.PROJ, nProjId, m_CurrProd.nProdId, sBTLFileName)
       ' vado in pagina proj
       Map.refMainMenuVM.SetSelPage(Pages.VIEW, False)
    End Sub
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
index 4929b0e6..9f0cfcdd 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
@@ -7,11 +7,11 @@
                               Style="{StaticResource ToolBar_EgtFloatingPanel}">
          
    <!--Barra superiore dei comandi-->
-   <!--<Button Command="{Binding NewCommand}"
+   <Button Command="{Binding New_Command}"
             ToolTip="{Binding NewToolTip}"
             Style="{StaticResource ToolBar_Button}">
       <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
-   </Button>-->
+   </Button>
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
            Style="{StaticResource ToolBar_Button}">
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 3530e49c..8dc1a285 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -1,5 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.DataLayer.DatabaseModels
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -8,12 +10,12 @@ Public Class ProjManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private m_CurrProj As ProjectFile
-   Friend Property CurrProj As ProjectFile
+   Private m_CurrProj As ProjectFileVM
+   Friend Property CurrProj As ProjectFileVM
       Get
          Return m_CurrProj
       End Get
-      Set(value As ProjectFile)
+      Set(value As ProjectFileVM)
          m_CurrProj = value
       End Set
    End Property
@@ -124,7 +126,7 @@ Public Class ProjManagerVM
 
    Private Sub NewProdFromProj()
       ' verifico se progetto modificato, e chiedo se salvare
-      ProjectFile.VerifyProjectModification(CurrProj, ProjectType.PROJ)
+      ProjectFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ)
       ' creo nuova ottimizzazione
       ' leggo indice di ottimizzazione
       Dim nProdsIndex As Integer = DbControllers.m_ProdController.GetNextIndex(CurrProj.nProjId)
@@ -160,7 +162,7 @@ Public Class ProjManagerVM
          ' aggiorno path proj
          Map.refProjManagerVM.CurrProj.SetProdId(nProdsIndex)
          ' imposto currprod
-         Map.refProdManagerVM.CurrProd = New ProjectFile(ProjectType.PROD, Path.GetFileNameWithoutExtension(sProdPath))
+         Map.refProdManagerVM.CurrProd = New ProjectFileVM(ProjectType.PROD, Path.GetFileNameWithoutExtension(sProdPath))
          ' setto flag nuovo progetto in prod
          Map.refProdManagerVM.CurrProd.NewProd = True
       Else
@@ -169,10 +171,70 @@ Public Class ProjManagerVM
       End If
    End Sub
 
+   Private Function InitNewProject(ByRef nProjId As Integer, ByRef sProjDir As String)
+      ' richiedo indice nuovo progetto
+      nProjId = DbControllers.m_ProjController.GetNextIndex()
+      sProjDir = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000")
+      ' creo cartella nuovo progetto
+      If Not Directory.Exists(sProjDir) Then
+         Directory.CreateDirectory(sProjDir)
+      Else
+         Dim di As System.IO.DirectoryInfo = New DirectoryInfo(sProjDir)
+         For Each file As FileInfo In di.EnumerateFiles()
+            file.Delete()
+         Next
+         For Each dir As DirectoryInfo In di.EnumerateDirectories()
+            dir.Delete(True)
+         Next
+      End If
+   End Function
+
+   Public Function SetCurrProj(nProjId As Integer) As Boolean
+      Dim Currproj As ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId)
+      If IsNothing(Currproj) Then Return False
+      m_CurrProj = New ProjectFileVM(ProjectFileM.CreateProjectFileM(ProjectType.PROJ, Currproj.ProjId, 0, Currproj.BTLFileName))
+      Return True
+   End Function
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
+#Region "New"
+
+   ''' <summary>
+   ''' Returns a command that do Save.
+   ''' </summary>
+   Public ReadOnly Property New_Command As ICommand
+      Get
+         If m_cmdSave Is Nothing Then
+            m_cmdSave = New Command(AddressOf NewProject)
+         End If
+         Return m_cmdSave
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Save.  This method is invoked by the SaveCommand.
+   ''' </summary>
+   Public Sub NewProject()
+      ' verifico se progetto modificato, e chiedo se salvare
+      ProjectFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ)
+      If Map.refSceneHostVM.MainController.NewProject() Then
+         ' inizializzo nuovo progetto
+         Dim nProjId As Integer = 0
+         Dim sProjDir As String = ""
+         InitNewProject(nProjId, sProjDir)
+         SetCurrProj(nProjId)
+         'DbControllers.m_ProjController.LockByProjId(m_CurrProj.nProjId)
+      Else
+         MessageBox.Show("Impossibile creare un nuovo file!!")
+      End If
+      Map.refMainWindowVM.UpdateTitle()
+   End Sub
+
+#End Region ' New
+
 #Region "OpenCommand"
 
    ''' <summary>
@@ -192,11 +254,11 @@ Public Class ProjManagerVM
    ''' </summary>
    Friend Sub Open()
       ' verifico se progetto modificato, e chiedo se salvare
-      ProjectFile.VerifyProjectModification(CurrProj, ProjectType.PROJ)
+      ProjectFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ)
       OpenProject(Nothing)
    End Sub
 
-   Friend Sub OpenProject(TempCurrProj As ProjectFile)
+   Friend Sub OpenProject(TempCurrProj As ProjectFileVM)
       ' se la string è vuota
       Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
       If IsNothing(TempCurrProj) Then
@@ -217,7 +279,7 @@ Public Class ProjManagerVM
       If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
          m_CurrProj = TempCurrProj
          'DbControllers.m_ProjController.LockByProjId(m_CurrProj.nProjId)
-         Map.refMainWindowVM.SetTitle(CurrProj.nProjId.ToString("0000") & " - " & CurrProj.BTLFileName & " - EgtBEAMWALL")
+         Map.refMainWindowVM.UpdateTitle()
       Else
          MessageBox.Show("Impossibile aprire il file!!")
          Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
@@ -311,7 +373,7 @@ Public Class ProjManagerVM
    ''' Execute the Export.  This method is invoked by the ExportCommand.
    ''' </summary>
    Public Sub Import()
-      ProjectFile.VerifyProjectModification(CurrProj, ProjectType.PROJ)
+      ProjectFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ)
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
       ' apro finestra scelta file
@@ -322,25 +384,12 @@ Public Class ProjManagerVM
                .CheckFileExists = True,
                .ValidateNames = True}
       If BTLDlg.ShowDialog() <> True Then Return
-      ' leggo indice di progetto
-      'Dim nProjId As Integer = GetMainPrivateProfileInt(S_GENERAL, K_PROJSINDEX, 1)
-      Dim nProjId As Integer = DbControllers.m_ProjController.GetNextIndex()
-      Dim sProjsDir As String = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000")
-      ' creo cartella nuovo progetto
-      If Not Directory.Exists(sProjsDir) Then
-         Directory.CreateDirectory(sProjsDir)
-      Else
-         Dim di As System.IO.DirectoryInfo = New DirectoryInfo(sProjsDir)
-         For Each file As FileInfo In di.EnumerateFiles()
-            file.Delete()
-         Next
-         For Each dir As DirectoryInfo In di.EnumerateDirectories()
-            dir.Delete(True)
-         Next
-      End If
-
+      ' inizializzo nuovo progetto
+      Dim nProjId As Integer = 0
+      Dim sProjDir As String = ""
+      InitNewProject(nProjId, sProjDir)
       ' copio file BTL
-      Dim sBtlCopyPath As String = sProjsDir & "\" & Path.GetFileName(BTLDlg.FileName)
+      Dim sBtlCopyPath As String = sProjDir & "\" & Path.GetFileName(BTLDlg.FileName)
       Dim bOk = False
       Try
          File.Copy(BTLDlg.FileName, sBtlCopyPath)
@@ -353,7 +402,7 @@ Public Class ProjManagerVM
       If bOk Then
          bOk = Map.refSceneHostVM.MainController.ImportProject(sBtlCopyPath, False)
       End If
-      Dim sProjFileName As String = sProjsDir & "\" & nProjId.ToString("0000") & FILENAMESEPARATOR & FILENAMESEPARATOR & Path.GetFileNameWithoutExtension(sBtlCopyPath) & ".nge"
+      Dim sProjFileName As String = sProjDir & "\" & nProjId.ToString("0000") & FILENAMESEPARATOR & FILENAMESEPARATOR & Path.GetFileNameWithoutExtension(sBtlCopyPath) & ".nge"
       If bOk Then
          ' scrivo info proj su tutti i pezzi
          Dim nPartId = EgtGetFirstPart()
@@ -368,10 +417,11 @@ Public Class ProjManagerVM
       End If
       If bOk Then
          ' aggiorno Db
-         DbControllers.m_ProjController.UpdateName(nProjId, Path.GetFileNameWithoutExtension(BTLDlg.FileName))
-         m_CurrProj = New ProjectFile(ProjectType.PROJ, Path.GetFileNameWithoutExtension(sProjFileName))
+         Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(BTLDlg.FileName)
+         DbControllers.m_ProjController.UpdateName(nProjId, sBTLFileName)
+         SetCurrProj(nProjId)
          'm_CurrProj.NewProj = True
-         Map.refMainWindowVM.SetTitle(CurrProj.nProjId.ToString("0000") & " - " & CurrProj.BTLFileName & " - EgtBEAMWALL")
+         Map.refMainWindowVM.UpdateTitle()
       Else
          ' elimino da Db
          DbControllers.m_ProjController.DeleteProj(nProjId)
@@ -420,7 +470,7 @@ Public Class ProjManagerVM
       'If m_CurrProj.nProdId > 0 Then
       If nProdId > 0 Then
          'Map.refSceneHostVM.MainController.OpenProject(m_CurrProj.sProdPath, False)
-         Map.refProdManagerVM.CurrProd = New ProjectFile(ProjectType.PROD, Path.GetFileNameWithoutExtension(m_CurrProj.sProdPath))
+         Map.refProdManagerVM.CurrProd = New ProjectFileVM(ProjectType.PROD, Path.GetFileNameWithoutExtension(m_CurrProj.sProdPath))
       Else
          '' chiedo se aggiungere ad ottimizzazione già presente o creare nuova
          'Select Case MessageBox.Show("Si: crea nuova ottimizzazione; No: aggiungi ad ottimizzazione già presente", "", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb
similarity index 71%
rename from EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb
rename to EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb
index e611bf35..e92bf446 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb
@@ -1,21 +1,42 @@
 Imports System.IO
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 
-Public Class ProjectFile
-   Inherits Core.ProjectFile
+Public Class ProjectFileVM
+   Inherits VMBase
+
+   Private m_ProjectFileM As ProjectFileM
+
+   Public ReadOnly Property nProjectType As ProjectType
+      Get
+         Return m_ProjectFileM.nProjectType
+      End Get
+   End Property
+
+   Public ReadOnly Property nProjId As Integer
+      Get
+         Return m_ProjectFileM.nProjId
+      End Get
+   End Property
+
+   Public ReadOnly Property nProdId As Integer
+      Get
+         Return m_ProjectFileM.nProdId
+      End Get
+   End Property
 
    Friend ReadOnly Property sProjDirPath As String
       Get
-         If IsNothing(m_nProjId) OrElse m_nProjId = 0 Then Return String.Empty
+         If IsNothing(m_ProjectFileM.nProjId) OrElse m_ProjectFileM.nProjId = 0 Then Return String.Empty
          Return refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000")
       End Get
    End Property
    Friend ReadOnly Property sProjPath As String
       Get
          Dim sPath As String = String.Empty
-         If IsNothing(m_nProjId) OrElse m_nProjId = 0 Then Return String.Empty
+         If IsNothing(m_ProjectFileM.nProjId) OrElse m_ProjectFileM.nProjId = 0 Then Return String.Empty
          sPath = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & FILENAMESEPARATOR
-         If Not IsNothing(m_nProdId) AndAlso m_nProdId > 0 Then
+         If Not IsNothing(m_ProjectFileM.nProdId) AndAlso m_ProjectFileM.nProdId > 0 Then
             sPath &= nProdId.ToString("0000")
          End If
          sPath &= FILENAMESEPARATOR & BTLFileName & ".nge"
@@ -26,54 +47,87 @@ Public Class ProjectFile
    Friend ReadOnly Property sProdDirPath As String
       Get
          Dim sPath As String = String.Empty
-         If IsNothing(m_nProdId) OrElse m_nProdId = 0 Then Return String.Empty
+         If IsNothing(m_ProjectFileM.nProdId) OrElse m_ProjectFileM.nProdId = 0 Then Return String.Empty
          Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000")
       End Get
    End Property
    Friend ReadOnly Property sProdPath As String
       Get
          Dim sPath As String = String.Empty
-         If IsNothing(m_nProdId) OrElse m_nProdId = 0 Then Return String.Empty
+         If IsNothing(m_ProjectFileM.nProdId) OrElse m_ProjectFileM.nProdId = 0 Then Return String.Empty
          Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
       End Get
    End Property
 
+   Public ReadOnly Property BTLFileName As String
+      Get
+         Return m_ProjectFileM.sBTLFileName
+      End Get
+   End Property
+
+   Public Property NewProj As Boolean
+      Get
+         Return m_ProjectFileM.NewProj
+      End Get
+      Set(value As Boolean)
+         m_ProjectFileM.NewProj = value
+      End Set
+   End Property
+
+   Public Property NewProd As Boolean
+      Get
+         Return m_ProjectFileM.NewProd
+      End Get
+      Set(value As Boolean)
+         m_ProjectFileM.NewProd = value
+      End Set
+   End Property
+
+
    ' nome del file mostrato nella finestra OpenProjFileDialog
    Public ReadOnly Property OpenFileName As String
       Get
-         If m_nProjectType = ProjectType.PROJ Then
-            Return m_nProjId.ToString("0000") & "  " & BTLFileName
-         ElseIf m_nProjectType = ProjectType.PROD Then
-            Return m_nProdId.ToString("0000")
+         If m_ProjectFileM.nProjectType = ProjectType.PROJ Then
+            Return m_ProjectFileM.nProjId.ToString("0000") & "  " & BTLFileName
+         ElseIf m_ProjectFileM.nProjectType = ProjectType.PROD Then
+            Return m_ProjectFileM.nProdId.ToString("0000")
          Else
             Return ""
          End If
       End Get
    End Property
 
-   Sub New(nProjectType As ProjectType, ProjectFileName As String)
-      m_nProjectType = nProjectType
-      If m_nProjectType = ProjectType.PROJ Then
-         Dim DataFromFileName As String() = ProjectFileName.Split(FILENAMESEPARATOR)
-         If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
-            Integer.TryParse(DataFromFileName(0), m_nProjId)
-         End If
-         If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
-            Integer.TryParse(DataFromFileName(1), m_nProdId)
-         Else
-            m_nProdId = 0
-         End If
-         If Not String.IsNullOrEmpty(DataFromFileName(2)) Then
-            m_BTLFileName = DataFromFileName(2)
-         End If
-      ElseIf m_nProjectType = ProjectType.PROD Then
-         Integer.TryParse(ProjectFileName, m_nProdId)
-      End If
+#Region "CONSTRUCTORS"
+
+   Sub New(ProjectFileM As ProjectFileM)
+      m_ProjectFileM = ProjectFileM
    End Sub
 
-   Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
-      MyBase.New(nProjectType, nProjId, nProdId, sBTLFileName)
-   End Sub
+   'Sub New(nProjectType As ProjectType, ProjectFileName As String)
+   '   m_nProjectType = nProjectType
+   '   If m_nProjectType = ProjectType.PROJ Then
+   '      Dim DataFromFileName As String() = ProjectFileName.Split(FILENAMESEPARATOR)
+   '      If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
+   '         Integer.TryParse(DataFromFileName(0), m_nProjId)
+   '      End If
+   '      If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
+   '         Integer.TryParse(DataFromFileName(1), m_nProdId)
+   '      Else
+   '         m_nProdId = 0
+   '      End If
+   '      If Not String.IsNullOrEmpty(DataFromFileName(2)) Then
+   '         m_BTLFileName = DataFromFileName(2)
+   '      End If
+   '   ElseIf m_nProjectType = ProjectType.PROD Then
+   '      Integer.TryParse(ProjectFileName, m_nProdId)
+   '   End If
+   'End Sub
+
+   'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
+   '   MyBase.New(nProjectType, nProjId, nProdId, sBTLFileName)
+   'End Sub
+
+#End Region    ' CONSTRUCTORS
 
    Friend Sub SetProdId(nProdId As Integer)
       ' rinomino proj con riferimento a prod
@@ -180,7 +234,7 @@ Public Class ProjectFile
       Return False
    End Function
 
-   Friend Shared Function VerifyProjectModification(CurrProject As ProjectFile, Type As ProjectType) As Boolean
+   Friend Shared Function VerifyProjectModification(CurrProject As ProjectFileVM, Type As ProjectType) As Boolean
       If IsNothing(CurrProject) Then Return False
       Dim bNewProject As Boolean = False
       Dim sProjectDirPath As String = ""