diff --git a/Guide/GuideView.xaml.vb b/Guide/GuideView.xaml.vb
index 386e4a0..70a08f2 100644
--- a/Guide/GuideView.xaml.vb
+++ b/Guide/GuideView.xaml.vb
@@ -9,7 +9,7 @@
       ' Add any initialization after the InitializeComponent() call.
       Me.DataContext = GuideViewModel
       m_GuideViewModel = GuideViewModel
-      DoorBrowser.Navigate(New Uri(IniFile.m_sHelpDir & "\" & m_Language & "\" & GuideViewModel.m_AddressGuide))
+      DoorBrowser.Navigate(New Uri(IniFile.m_sHelpDir & "\" & m_Language & "\" & GuideViewModel.m_AddressGuide & ".html"))
    End Sub
 
 End Class
diff --git a/Guide/GuideViewModel.vb b/Guide/GuideViewModel.vb
index be6edb8..f3a4a56 100644
--- a/Guide/GuideViewModel.vb
+++ b/Guide/GuideViewModel.vb
@@ -5,7 +5,7 @@ Imports EgtUILib
 
 Public Class GuideViewModel
    ' se non è stata selezionato ancora nulla allora faccio partire il menu principale
-   Public Shared m_AddressGuide As String = "MainMenu.html"
+   Public Shared m_AddressGuide As String = "MainMenu"
 
    Public ReadOnly Property Title As String
       Get
diff --git a/MainWindow/MainWindowViewModel.vb b/MainWindow/MainWindowViewModel.vb
index 8b2befe..d71b5e9 100644
--- a/MainWindow/MainWindowViewModel.vb
+++ b/MainWindow/MainWindowViewModel.vb
@@ -228,6 +228,9 @@ Public Class MainWindowViewModel
          End If
       End If
 
+      If MessageBox.Show("Do you want to quit?", EgtMsg(50110), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
+ 
+
       EgtExit()
       '' Disabilito gestore Idle
       'RemoveHandler Application.Idle, AddressOf Application_Idle
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 7727091..bb38bc1 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.8.5.7")> 
-<Assembly: AssemblyFileVersion("1.8.5.7")> 
+<Assembly: AssemblyVersion("1.8.5.8")> 
+<Assembly: AssemblyFileVersion("1.8.5.8")> 
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index 2268047..60f6162 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -7,6 +7,7 @@ Public Class OptionsViewModel
 
    Dim m_rfMainWindowViewModel As MainWindowViewModel
    Dim m_rfCurrDoor As Door
+   ' serve per definire l'indirizzo per la guida (senza aggiungere l'estenzione!)
    Dim m_Chapter As String
 
    Public ReadOnly Property LanguageList As ObservableCollection(Of Language)
@@ -24,6 +25,7 @@ Public Class OptionsViewModel
             OptionModule.m_SelectedLanguage = value
             WritePrivateProfileString(S_GENERAL, K_MESSAGES, m_SelectedLanguage.Name)
          End If
+         m_Chapter = "language"
       End Set
    End Property
 
@@ -50,6 +52,7 @@ Public Class OptionsViewModel
             EgtSetUiUnits(OptionModule.m_bIsMmUnit)
             WritePrivateProfileString(S_SCENE, K_MMUNITS, If(OptionModule.m_bIsMmUnit, 1, 0).ToString)
          End If
+         m_Chapter = "unit_measure"
       End Set
    End Property
 
@@ -74,7 +77,7 @@ Public Class OptionsViewModel
                Case "Empty"
                   WritePrivateProfileString(S_LAUNCHERWINDOW, K_LAUNCHER, CStr(2))
             End Select
-
+            m_Chapter = "start_up"
          End If
       End Set
    End Property
@@ -108,7 +111,7 @@ Public Class OptionsViewModel
          Else
             Return
          End If
-         m_Chapter = "bevel_up.html"
+         m_Chapter = "bevel_up"
       End Set
    End Property
 
@@ -137,6 +140,7 @@ Public Class OptionsViewModel
          Else
             Return
          End If
+         m_Chapter = "bevel_down"
       End Set
    End Property
 
@@ -148,6 +152,7 @@ Public Class OptionsViewModel
       Set(value As String)
          OptionModule.m_Width = value
          DefaultWritePrivateProfileString(S_SIZE, K_WIDTH_INI, OptionModule.m_Width)
+         m_Chapter = "general"
       End Set
    End Property
 
@@ -767,9 +772,9 @@ Public Class OptionsViewModel
    Public Sub F1Guide()
       Dim rfGuideViewModel As New GuideViewModel
       If String.IsNullOrEmpty(m_Chapter) Then
-         GuideViewModel.m_AddressGuide = "2_6.html"
+         GuideViewModel.m_AddressGuide = "option_page"
       Else
-         GuideViewModel.m_AddressGuide = m_Chapter
+         GuideViewModel.m_AddressGuide = "OptionPage\" & m_Chapter
       End If
       m_rfMainWindowViewModel.ProjectManagerViewModel.Guide()
    End Sub