diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index bfbcd44..56b6ff8 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -872,7 +872,7 @@
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ItemsControl}">
-               <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" CanContentScroll="True">
+               <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" >
                   <ItemsPresenter/>
                </ScrollViewer>
             </ControlTemplate>
diff --git a/SetUpWindow/SetUpView.xaml b/SetUpWindow/SetUpView.xaml
index 04f99a8..7c70a68 100644
--- a/SetUpWindow/SetUpView.xaml
+++ b/SetUpWindow/SetUpView.xaml
@@ -94,7 +94,7 @@
             <ItemsControl.ItemTemplate>
                <DataTemplate>
 
-                  <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}">
+                  <ItemsControl Grid.Column="1" ItemsSource="{Binding PositionList}" Margin="0,0,30,0">
                      <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
                            <WrapPanel Orientation="Vertical"/>
@@ -102,9 +102,9 @@
                      </ItemsControl.ItemsPanel>
                      <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                           <Grid Margin="5">
+                           <Grid Margin="5,5,15,5">
                               <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="50"/>
+                                 <ColumnDefinition Width="30"/>
                                  <ColumnDefinition Width="1*"/>
                               </Grid.ColumnDefinitions>
 
diff --git a/SetUpWindow/SetUpViewModel.vb b/SetUpWindow/SetUpViewModel.vb
index c8ad429..4758335 100644
--- a/SetUpWindow/SetUpViewModel.vb
+++ b/SetUpWindow/SetUpViewModel.vb
@@ -433,7 +433,7 @@ Namespace EgtCAM5
          Dim sPath As String = String.Empty
          ' Apertura dialogo di salvataggio
          Dim SaveFileDialogView As New EgtWPFLib5.EgtSaveFileDialog
-         SaveFileDialogView.Title = EgtMsg(MSG_SETUP + 5)
+         SaveFileDialogView.Title = EgtMsg(MSG_SETUP + 3) & " " & EgtMsg(MSG_SETUP + 1)
          SaveFileDialogView.Extension = ".stu"
          SaveFileDialogView.Directory = sDir
          SaveFileDialogView.FileName = String.Empty
@@ -494,7 +494,7 @@ Namespace EgtCAM5
          Dim sPath As String = String.Empty
          ' Apertura dialogo di salvataggio
          Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog
-         OpenFileDialogView.Title = EgtMsg(MSG_SETUP + 5)
+         OpenFileDialogView.Title = EgtMsg(MSG_SETUP + 4) & " " & EgtMsg(MSG_SETUP + 1)
          OpenFileDialogView.Filter = "*.stu"
          OpenFileDialogView.Directory = sDir
          OpenFileDialogView.FileName = String.Empty