diff --git a/AboutBoxWindow/AboutBoxV.xaml b/AboutBoxWindow/AboutBoxV.xaml
index d26c348..63b173d 100644
--- a/AboutBoxWindow/AboutBoxV.xaml
+++ b/AboutBoxWindow/AboutBoxV.xaml
@@ -2,7 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" Visibility="{Binding AboutBoxVisibility,Mode=OneWay}" WindowStartupLocation="CenterOwner">
+    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -45,7 +45,7 @@
                VerticalAlignment="Center" FontSize="12" />
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch" FontSize="12" IsReadOnly="true" TextWrapping="Wrap"/>
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="9" Command="{Binding Close}"
+         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="9" IsCancel="True"
             Margin="1,0"/>
 
       </Grid>
diff --git a/AboutBoxWindow/AboutBoxV.xaml.vb b/AboutBoxWindow/AboutBoxV.xaml.vb
index 3f05f7d..5ffce3c 100644
--- a/AboutBoxWindow/AboutBoxV.xaml.vb
+++ b/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -2,18 +2,7 @@
 
 Public Class AboutBoxV
 
-   Sub New()
-      ' This call is required by the designer.
-      InitializeComponent()
-
-      ' '' Add any initialization after the InitializeComponent() call.
-   End Sub
-
-   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      Me.Visibility = Windows.Visibility.Hidden
-   End Sub
-
-   Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+   Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       Me.Owner = Application.Current.MainWindow
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
       VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb
index a664d41..9815477 100644
--- a/DoorParameters/Part.vb
+++ b/DoorParameters/Part.vb
@@ -60,7 +60,7 @@ Public Class Part
       End Get
       Set(value As List(Of String))
          m_SwingTypeList = value
-         'NotifyPropertyChanged("SwingTypeList")
+         NotifyPropertyChanged("SwingTypeList")
       End Set
    End Property
 
diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml
index af55832..2e22eba 100644
--- a/MainWindow/MainWindowV.xaml
+++ b/MainWindow/MainWindowV.xaml
@@ -7,7 +7,7 @@
    Title="{Binding ProjectNameMsg}" Icon="/Resources/EgtDOOR.ico"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
    MinHeight="600" MinWidth="800"
-   AboutBox="{Binding AboutBox}" WindowStyle="None" ResizeMode="NoResize"
+   AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
    CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="Enter" Command="{Binding DataContext.RefreshCmd,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"/>
diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 7f00893..c86b55c 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -64,17 +64,6 @@ Public Class MainWindowVM
       End Get
    End Property
 
-   Private m_AboutBox As Window
-   Private bFirstAboutBox As Boolean = True
-   Public ReadOnly Property AboutBox As Window
-      Get
-         If bFirstAboutBox Then
-            m_AboutBox = New AboutBoxV()
-         End If
-         Return New AboutBoxV
-      End Get
-   End Property
-
    Sub New()
       Map.SetRefMainWindowVM(Me)
       m_AssemblyPage = New AssemblyPageV
@@ -83,7 +72,8 @@ Public Class MainWindowVM
       m_PartPage.DataContext = New PartPageVM
    End Sub
 
-   ' MainWindow Closing Event
+   ' Comandi
+   Private m_cmdAboutBox As ICommand
    Private m_cmdClose As ICommand
 
    Public Sub SetLauncher()
@@ -134,6 +124,28 @@ Public Class MainWindowVM
       End If
    End Sub
 
+
+#Region "AboutBoxCommand"
+
+   ' Returns a command that manage the MainWindow_Unloaded command
+   Public ReadOnly Property AboutBoxCommand() As ICommand
+      Get
+         If m_cmdAboutBox Is Nothing Then
+            m_cmdAboutBox = New Command(AddressOf AboutBox)
+         End If
+         Return m_cmdAboutBox
+      End Get
+   End Property
+
+   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+   Public Sub AboutBox(ByVal param As Object)
+      Dim AboutBoxWindow As New AboutBoxV
+      AboutBoxWindow.Owner = Application.Current.MainWindow
+      AboutBoxWindow.ShowDialog()
+   End Sub
+
+#End Region ' AboutBoxCommand
+
 #Region "CloseApplicationCommand"
 
    ''' <summary>
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index e7617c1..fca2ae5 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -178,7 +178,7 @@ Friend Module OptionModule
       Dim sMachinDir As String = String.Empty
       If GetMainPrivateProfileString(S_DOORS, K_MACHINDIR, "", sMachinDir) <> 0 Then
          If Not Directory.Exists(sMachinDir) Then
-            ' manntego l'accesso a quello di default
+            ' mantengo l'accesso a quello di default
             EgtOutLog("Warning : " & sMachinDir & " does not exist")
             ' controllo che il direttorio che era stato passato di default esista
          Else
diff --git a/ProjectManager/ProjectManagerV.xaml b/ProjectManager/ProjectManagerV.xaml
index 3e960dd..fb4ea4f 100644
--- a/ProjectManager/ProjectManagerV.xaml
+++ b/ProjectManager/ProjectManagerV.xaml
@@ -21,14 +21,6 @@
    <!--<Button Command="{Binding SaveAsCommand}" ToolTip="{Binding SaveAsToolTip}">
       <Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
    </Button>-->
-   <Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}" Focusable="False">
-      <Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
-   </Button>
-   <Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}" Focusable="False">
-      <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
-   </Button>
-   
-   <!--creazione del bottone per la creazione di un template-->
    <Button Command="{Binding CreateTemplateCommand}" ToolTip="{Binding TemplateDoorToolTip}" Focusable="False">
       <ContentControl>
          <Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform" />
@@ -39,6 +31,12 @@
          <Image Source="/Resources/TopCommandBar/Export.png" Stretch="Uniform" />
       </ContentControl>
    </Button>
+   <Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}" Focusable="False">
+      <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
+   </Button>
+   <Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}" Focusable="False">
+      <Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
+   </Button>
    <Button Command="{Binding GuideCommand}" ToolTip="{Binding GuideToolTip}" Focusable="False">
       <ContentControl>
          <Image Source="/Resources/TopCommandBar/Help.png" Stretch="Uniform" />
diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb
index 0ed8087..1435c7a 100644
--- a/ProjectManager/ProjectManagerVM.vb
+++ b/ProjectManager/ProjectManagerVM.vb
@@ -90,17 +90,10 @@ Public Class ProjectManagerVM
 
    Public ReadOnly Property CopyToolTip As String
       Get
-         Return "Exoprt in machine"
+         Return "Export to machine"
       End Get
    End Property
 
-   Public ReadOnly Property Copy As String
-      Get
-         Return "Copy"
-      End Get
-   End Property
-
-
 #End Region ' ToolTip
 
 #End Region    ' Fields & Properties
@@ -515,7 +508,6 @@ Public Class ProjectManagerVM
 
 #End Region    ' CreateTemplate
 
-
 #Region "Guide"
    Public ReadOnly Property GuideCommand As ICommand
       Get
@@ -545,44 +537,39 @@ Public Class ProjectManagerVM
    End Property
 
    Public Sub CopyDDF()
-      Dim Result = MessageBox.Show("Do yuo want to copy all files? (yes). Do you want to copy the current file? (no)", "?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
+      'Verifico che tutto sia salvato, altrimenti esco con messaggio
+      If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified() Then
+         MessageBox.Show("Project must be saved before copying", EgtMsg(50144), MessageBoxButton.OK, MessageBoxImage.Warning)
+         Return
+      End If
+      Dim sMsg As String = "Do you want to copy all files ?" & vbCrLf & vbCrLf & "(No to copy only the current file)"
+      Dim Result = MessageBox.Show(sMsg, "Export to machine", MessageBoxButton.YesNoCancel, MessageBoxImage.Question)
       Dim CurrProjetc As String = Map.refAssemblyManagerVM.CurrProject.Name
       Dim MachinProject As String = IniFile.m_MachinProject
-      Dim CurrFile As String = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name
-      Dim MachinFile As String = String.Empty
       If String.IsNullOrEmpty(MachinProject) Then
-         MessageBox.Show("Machin Directory not found", EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
+         MessageBox.Show("Machine Directory not found", EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If
       Select Case Result
          Case MessageBoxResult.Yes
             For IndexFile As Integer = 0 To Map.refAssemblyManagerVM.CurrProject.AssemblyList.Count - 1
-               ' controllo che abbia estenzione ddf
+               ' controllo che abbia estensione ddf
                If Path.GetExtension(Map.refAssemblyManagerVM.CurrProject.AssemblyList(IndexFile).Name) = ".ddf" Then
-                  If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName.Contains("*") Then
-                     Dim Length As Integer = Map.refAssemblyManagerVM.CurrProject.AssemblyList(IndexFile).GraphicName.Length - 1
-                     Dim FileName As String = Map.refAssemblyManagerVM.CurrProject.AssemblyList(IndexFile).GraphicName.Remove(Length)
-                     MachinFile = MachinProject & "/" & FileName & ".ddf"
-                  Else
-                     MachinFile = MachinProject & "/" & Map.refAssemblyManagerVM.CurrProject.AssemblyList(IndexFile).GraphicName & ".ddf"
-                  End If
+                  Dim SouFile As String = Map.refAssemblyManagerVM.CurrProject.AssemblyList(IndexFile).Name
+                  Dim DestFile As String = Path.Combine(MachinProject, Path.GetFileName(SouFile))
                   Try
-                     File.Copy(CurrFile, MachinFile, True)
+                     File.Copy(SouFile, DestFile, True)
                   Catch ex As System.IO.IOException
                      MessageBox.Show("Error in copying: " & ex.Message)
+                     Exit For
                   End Try
                End If
             Next
          Case MessageBoxResult.No
+            Dim SouFile As String = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name
+            Dim DestFile As String = Path.Combine(MachinProject, Path.GetFileName(SouFile))
             Try
-               If Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName.Contains("*") Then
-                  Dim Length As Integer = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName.Length - 1
-                  Dim FileName As String = Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName.Remove(Length)
-                  MachinFile = MachinProject & "/" & FileName & ".ddf"
-               Else
-                  MachinFile = MachinProject & "/" & Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.GraphicName & ".ddf"
-               End If
-               File.Copy(CurrFile, MachinFile, True)
+               File.Copy(SouFile, DestFile, True)
             Catch ex As System.IO.IOException
                MessageBox.Show("Error in copying: " & ex.Message)
             End Try
diff --git a/Resources/TopCommandBar/Export.png b/Resources/TopCommandBar/Export.png
index 3bcb2f8..472f5dd 100644
Binary files a/Resources/TopCommandBar/Export.png and b/Resources/TopCommandBar/Export.png differ
diff --git a/Resources/TopCommandBar/Help.png b/Resources/TopCommandBar/Help.png
index 1da4d11..a3c35c3 100644
Binary files a/Resources/TopCommandBar/Help.png and b/Resources/TopCommandBar/Help.png differ
diff --git a/Resources/TopCommandBar/SaveAs.png b/Resources/TopCommandBar/SaveAs.png
index 1d5cfae..7642a93 100644
Binary files a/Resources/TopCommandBar/SaveAs.png and b/Resources/TopCommandBar/SaveAs.png differ