diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index d8bb87b..8cb2eb7 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -865,9 +865,20 @@ Public Class MySceneHostVM
          End If
          MessageBox.Show(Application.Current.MainWindow, sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error)        'Error
       End If
-      ' leggo materiale
+      ' leggo materiale e macchina
       Dim nTabPartId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, TABLE)
       If nTabPartId <> GDB_ID.NULL Then
+         Dim sMachineName As String = ""
+         EgtGetInfo(nTabPartId, KEY_MACHINE_NAME, sMachineName)
+         Dim ProjectMachine As Machine = Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) x.Name = sMachineName)
+         If Not IsNothing(ProjectMachine) Then
+            ' imposto la macchina
+            Map.refMachinePanelVM.SelectedMachine = ProjectMachine
+         Else
+            MessageBox.Show("Project machine not found! Impossible to open the project.", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            Map.refProjManagerVM.NewProject(False)
+            Return
+         End If
          Dim sMaterialGuid As String = ""
          EgtGetInfo(nTabPartId, KEY_MATERIAL_GUID, sMaterialGuid)
          Dim MaterialGuid As Guid
diff --git a/Icarus/TSFEditor/TFSEditorV.xaml b/Icarus/TSFEditor/TFSEditorV.xaml
index 03f40e0..bd8369b 100644
--- a/Icarus/TSFEditor/TFSEditorV.xaml
+++ b/Icarus/TSFEditor/TFSEditorV.xaml
@@ -17,7 +17,7 @@
          <WrapPanel Orientation="Horizontal" x:Name="TFSEditorStackPanel">
             <ComboBox ItemsSource="{Binding MediaTypeList}"
                       SelectedIndex="{Binding ghSelMediaType}"
-                      Margin="0,0,10,0"
+                      Margin="0,5,10,5"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <Grid>
                <Grid.ColumnDefinitions>
@@ -31,11 +31,13 @@
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="Slice Number:"
                              Visibility="{Binding MediaHeight_Visibility}"
+                             Margin="2.5,0,2.5,0"
                              Style="{StaticResource TSFEditor_TextBlock}"/>
                   <TextBox Grid.Column="1"
                            Text="{Binding sMediaHeight}"
                            Width="50"
                            Visibility="{Binding MediaHeight_Visibility}"
+                           Margin="2.5,0,2.5,0"
                            Style="{StaticResource ControllerInputPanel_TextBox}"/>
                </Grid>
                <Grid>
@@ -45,11 +47,13 @@
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="Difference:"
                              Visibility="{Binding Difference_Visibility}"
+                             Margin="2.5,0,2.5,0"
                              Style="{StaticResource TSFEditor_TextBlock}"/>
                   <TextBox Grid.Column="1"
                            Text="{Binding sDifference}"
                            Width="50"
                            Visibility="{Binding Difference_Visibility}"
+                           Margin="2.5,0,2.5,0"
                            Style="{StaticResource ControllerInputPanel_TextBox}"/>
                </Grid>
                <Grid>
@@ -59,11 +63,13 @@
                   </Grid.ColumnDefinitions>
                   <TextBlock Text="F:"
                              Visibility="{Binding FCurr_Visibility}"
+                             Margin="2.5,0,2.5,0"
                              Style="{StaticResource TSFEditor_TextBlock}"/>
                   <TextBox Grid.Column="1"
                            Text="{Binding sFCurr}"
                            Width="50"
                            Visibility="{Binding FCurr_Visibility}"
+                           Margin="2.5,0,2.5,0"
                            Style="{StaticResource ControllerInputPanel_TextBox}"/>
                </Grid>
                <StackPanel Grid.Column="1"
@@ -71,12 +77,15 @@
                   <Button Content="Set"
                           Command="{Binding Set_Command}"
                           Visibility="{Binding FCurr_Visibility}"
+                          Margin="2.5,0,2.5,0"
                           Style="{StaticResource ToolBar_TextButton}"/>
                   <Button Content="Media"
                           Command="{Binding Media_Command}"
+                          Margin="2.5,0,2.5,0"
                           Style="{StaticResource ToolBar_TextButton}"/>
                   <Button Content="Reset"
                           Command="{Binding Reset_Command}"
+                          Margin="2.5,0,2.5,0"
                           Style="{StaticResource ToolBar_TextButton}"/>
                </StackPanel>
             </Grid>
@@ -92,7 +101,7 @@
                    ScrollViewer.CanContentScroll="True" 
                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                   Margin="0,0,0,5">
+                   Margin="0,5,0,5">
             <DataGrid.Columns>
                <DataGridTextColumn Header="Index" 
                                    Binding="{Binding nIndex}"
@@ -166,9 +175,11 @@
          <StackPanel Grid.Row="2" Orientation="Horizontal">
             <ComboBox ItemsSource="{Binding FilterList}"
                       SelectedIndex="{Binding nSelFilter}"
+                      Margin="0,0,2.5,0"
                       Style="{StaticResource PartParam_ComboBox}"/>
             <Button Content="Extend"
                     Command="{Binding Extend_Command}"
+                    Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_TextButton}"/>
          </StackPanel>
       </Grid>
diff --git a/Icarus/TopPanel/TopPanelV.xaml b/Icarus/TopPanel/TopPanelV.xaml
index 58ad88f..afc3bc8 100644
--- a/Icarus/TopPanel/TopPanelV.xaml
+++ b/Icarus/TopPanel/TopPanelV.xaml
@@ -148,8 +148,8 @@
                        Style="{StaticResource PrintParam_ToggleButton}">
             <Grid HorizontalAlignment="Stretch">
                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="3*"/>
+                  <ColumnDefinition Width="1.5*"/>
                   <ColumnDefinition Width="2*"/>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="2*"/>
diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb
index 4e6c414..9ac54cc 100644
--- a/Icarus/TopPanel/TopPanelVM.vb
+++ b/Icarus/TopPanel/TopPanelVM.vb
@@ -206,7 +206,8 @@ Public Class TopPanelVM
          ' salvo materiale selezionato come ultimo utilizzato
          If Not IsNothing(value) Then WriteMainPrivateProfileString(S_PRINTING3D, K_CURRMATERIAL, value.sGUID)
          ' salvo lavorazione selezionata per riselezionarlo
-         Dim PrevMachiningGuid As Guid = m_SelMachining.sGUID
+         Dim PrevMachiningGuid As Guid = Guid.Empty
+         If Not IsNothing(m_SelMachining) Then PrevMachiningGuid = m_SelMachining.sGUID
          ' seleziono materiale
          m_SelMaterial = value
          ' scrivo materiale sulla tavola
diff --git a/Icarus/Utility/CurrentMachine.vb b/Icarus/Utility/CurrentMachine.vb
index 142e107..9623e85 100644
--- a/Icarus/Utility/CurrentMachine.vb
+++ b/Icarus/Utility/CurrentMachine.vb
@@ -79,7 +79,8 @@ Public Module CurrentMachine
       Dim nQqqId = EgtAddMachGroup("qqq")
       EgtSetTable("Tab")
       EgtGetTableArea(1, m_b3Tab)
-      EgtRemoveMachGroup(nQqqId Or GDB_ID.NULL)
+      EgtResetCurrMachGroup()
+      EgtRemoveMachGroup(nQqqId)
       ' carico materiali e lavorazioni
       Map.refTopPanelVM.InitMaterialList()
       Map.refMaterialDbVM.Init()