diff --git a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
index 67cb498..fbd78f6 100644
--- a/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InfoExpander/InfoExpanderV.xaml
@@ -7,10 +7,8 @@
       <Expander.Header>
          <TextBlock Text="{Binding PropertiesMsg}"/>
       </Expander.Header>
-      <UniformGrid>
-         <TextBox Text="{Binding InfoBox, Mode=OneWay}" IsReadOnly="True"
-                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
-      </UniformGrid>
+      <TextBox Text="{Binding InfoBox, Mode=OneWay}" IsReadOnly="True"
+               HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
    </Expander>
 
 </UserControl>
diff --git a/OptionPanel/DrawOptionPanelV.xaml b/OptionPanel/DrawOptionPanelV.xaml
index f4cefa2..85926e8 100644
--- a/OptionPanel/DrawOptionPanelV.xaml
+++ b/OptionPanel/DrawOptionPanelV.xaml
@@ -6,18 +6,18 @@
 
    <Grid x:Name="DrawGrid" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Grid.RowDefinitions>
-         <RowDefinition MinHeight="0" Height="400" MaxHeight="800" 
+         <RowDefinition MinHeight="100" MaxHeight="800" 
                         EgtCAM5:DrawOptionPanelVM.RowId="ManageLayer"
                         EgtCAM5:DrawOptionPanelVM.IsExpanded="{Binding ManageLayerRowIsExpanded}"
                         EgtCAM5:DrawOptionPanelVM.TargetSplitter="{Binding ElementName=ManagerLayerGridSplitter}"/>
-         <RowDefinition MinHeight="0" Height="150" MaxHeight="400" 
+         <RowDefinition MinHeight="100" MaxHeight="400" 
                         EgtCAM5:DrawOptionPanelVM.RowId="Info"
                         EgtCAM5:DrawOptionPanelVM.IsExpanded="{Binding InfoRowIsExpanded}"
                         EgtCAM5:DrawOptionPanelVM.TargetSplitter="{Binding ElementName=InfoGridSplitter}"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <!--ContentPresenter that contains the ManageLayerExpander-->
-      <ContentPresenter  Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
+      <ContentPresenter Content="{Binding ManageLayerExpander,Mode=OneWay}"/>
       <GridSplitter x:Name="ManagerLayerGridSplitter" Style="{StaticResource General_GridSplitter}"/>
       <!--ContentPresenter that contains the InfoExpander-->
       <ContentPresenter  Grid.Row="1" Content="{Binding InfoExpander}"/>
diff --git a/OptionPanel/DrawOptionPanelV.xaml.vb b/OptionPanel/DrawOptionPanelV.xaml.vb
index 4e30a6c..f6e6750 100644
--- a/OptionPanel/DrawOptionPanelV.xaml.vb
+++ b/OptionPanel/DrawOptionPanelV.xaml.vb
@@ -9,21 +9,21 @@
       Map.SetRefDrawOptionPanelV(Me)
       If Not IsActivePlugin() Then
          AddHandler DrawGrid.Loaded,
-        Sub()
-           DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
-           DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
-           DrawGrid.UpdateLayout()
-        End Sub
+            Sub()
+               DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+               DynamicGridModule.RestoreDrawGridLayout(DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+               DrawGrid.UpdateLayout()
+            End Sub
 
          AddHandler ManagerLayerGridSplitter.DragCompleted,
-         Sub()
-            DynamicGridModule.SaveDrawGridLayout(DrawGrid, "ManageLayer", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
-         End Sub
+            Sub()
+               DynamicGridModule.SaveDrawGridLayout(DrawGrid, "ManageLayer", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            End Sub
 
          AddHandler InfoGridSplitter.DragCompleted,
-         Sub()
-            DynamicGridModule.SaveDrawGridLayout(DrawGrid, "Info", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
-         End Sub
+            Sub()
+               DynamicGridModule.SaveDrawGridLayout(DrawGrid, "Info", If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            End Sub
       End If
    End Sub
 
diff --git a/OptionPanel/DrawOptionPanelVM.vb b/OptionPanel/DrawOptionPanelVM.vb
index 2608e8d..4a6e1c2 100644
--- a/OptionPanel/DrawOptionPanelVM.vb
+++ b/OptionPanel/DrawOptionPanelVM.vb
@@ -157,6 +157,7 @@ Public Class DrawOptionPanelVM
          row.ClearValue(RowDefinition.HeightProperty)
 
          row.Height = New GridLength(1, GridUnitType.Auto)
+         row.MinHeight = 0
       Else
          If File.Exists(Map.refMainWindowVM.DimensionDir) Then
             DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
diff --git a/OptionPanel/MachiningOptionPanelV.xaml b/OptionPanel/MachiningOptionPanelV.xaml
index c368965..42d62fd 100644
--- a/OptionPanel/MachiningOptionPanelV.xaml
+++ b/OptionPanel/MachiningOptionPanelV.xaml
@@ -6,7 +6,7 @@
 
    <Grid x:Name="MachiningGrid" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Grid.RowDefinitions>
-         <RowDefinition MinHeight="0" Height="350" MaxHeight="800" 
+         <RowDefinition MinHeight="100" Height="400" MaxHeight="800" 
                         EgtCAM5:MachiningOptionPanelVM.IsExpanded="{Binding OperationsListRowIsExpanded}"
                         EgtCAM5:MachiningOptionPanelVM.TargetSplitter="{Binding ElementName=MachiningGridSplitter}"/>
          <RowDefinition Height="Auto"/>
diff --git a/OptionPanel/MachiningOptionPanelV.xaml.vb b/OptionPanel/MachiningOptionPanelV.xaml.vb
index 728e9ca..f89ed21 100644
--- a/OptionPanel/MachiningOptionPanelV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanelV.xaml.vb
@@ -16,9 +16,9 @@
             End Sub
 
          AddHandler MachiningGridSplitter.DragCompleted,
-          Sub()
-             DynamicGridModule.SaveMachiningGridLayout(MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
-          End Sub
+            Sub()
+               DynamicGridModule.SaveMachiningGridLayout(MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
+            End Sub
       End If
    End Sub
 
diff --git a/OptionPanel/MachiningOptionPanelVM.vb b/OptionPanel/MachiningOptionPanelVM.vb
index 0dc9bf2..788ca1f 100644
--- a/OptionPanel/MachiningOptionPanelVM.vb
+++ b/OptionPanel/MachiningOptionPanelVM.vb
@@ -257,6 +257,7 @@ Public Class MachiningOptionPanelVM
          row.ClearValue(RowDefinition.HeightProperty)
 
          row.Height = New GridLength(1, GridUnitType.Auto)
+         row.MinHeight = 0
       Else
          If File.Exists(Map.refMainWindowVM.DimensionDir) Then
             DynamicGridModule.RestoreMachiningGridLayout(Map.refMachiningOptionPanelV.MachiningGrid, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_MACHINING_PLUGIN, DynamicGridModule.PROJECT_MACHINING))
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 3c18299..361a021 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -2,6 +2,7 @@
 Imports System.IO
 Imports System.Windows.Forms.Integration
 Imports System.Windows.Interop
+Imports System.Windows.Threading
 Imports EgtUILib
 Imports EgtUILib.EgtInterface
 Imports EgtWPFLib5
@@ -173,11 +174,10 @@ Public Class ProjectVM
       m_DynamicGrid.Children.Add(m_SceneContentControlV)
       ' Carico le dimensioni salvate su ini se presenti
       AddHandler m_DynamicGrid.Loaded,
-      Sub()
-         DynamicGridModule.RestoreGridLayout(If(IsActivePlugin(), DynamicGridModule.PROJECT_EGTCAM5_PLUGIN, DynamicGridModule.PROJECT_EGTCAM5))
-         m_DynamicGrid.UpdateLayout()
-      End Sub
-
+         Sub()
+            DynamicGridModule.RestoreGridLayout(If(IsActivePlugin(), DynamicGridModule.PROJECT_EGTCAM5_PLUGIN, DynamicGridModule.PROJECT_EGTCAM5))
+            m_DynamicGrid.UpdateLayout()
+         End Sub
       m_PanelList.Add(m_DynamicGrid)
    End Sub
 
@@ -1393,6 +1393,13 @@ Public Class ProjectVM
             EgtDraw()
          End If
       End If
+      ' Carico se presenti le dimensioni della griglia
+      Application.Current.Dispatcher.BeginInvoke(
+         Sub()
+            DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+            DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+         End Sub,
+      DispatcherPriority.Render)
    End Sub
 
    Private Sub OnMouseSelectedColor(ByVal sender As Object, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedColor
diff --git a/SpecialPanel/SpecialPanelVM.vb b/SpecialPanel/SpecialPanelVM.vb
index 0278525..caffb68 100644
--- a/SpecialPanel/SpecialPanelVM.vb
+++ b/SpecialPanel/SpecialPanelVM.vb
@@ -1,4 +1,5 @@
 Imports System.IO
+Imports System.Windows.Threading
 Imports EgtUILib
 
 Public Class SpecialPanelVM
@@ -32,10 +33,10 @@ Public Class SpecialPanelVM
       Map.SetRefSpecialPanelVM(Me)
       ' se attivo, inizializzo i bottoni leggendoli da file ini
       If IniFile.IsActiveSpecialPanel(False) Then
-         Dim BtlIndexMax As Integer = If( IniFile.m_nUserLevel > 5, 199, 99)
+         Dim BtlIndexMax As Integer = If(IniFile.m_nUserLevel > 5, 199, 99)
          For BtnIndex As Integer = 1 To BtlIndexMax
             Dim CurrBtn As ButtonListItem = Nothing
-            If GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)Then
+            If GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn) Then
                m_ButtonList.Add(CurrBtn)
             End If
          Next
@@ -191,6 +192,9 @@ Public Class ButtonItem
       Map.refProjectVM.PreExecScript(False)
       Map.refProjectVM.ExecScript(m_sLuaCmdPath, bRaiseEvent)
       m_sCurrBarName = Nothing
+      ' Carico se presenti le dimensioni della griglia
+      DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "ManageLayer", 0, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
+      DynamicGridModule.RestoreDrawGridLayout(Map.refDrawOptionPanelV.DrawGrid, "Info", 1, If(IniFile.IsActivePlugin(), DynamicGridModule.PROJECT_DRAW_PLUGIN, DynamicGridModule.PROJECT_DRAW))
    End Sub
 
    Private Shared Sub OnPreControllerExec(sFilePath As String) Handles m_ProjectVM.OnPreControllerExec
diff --git a/Utility/DynamicGridModule.vb b/Utility/DynamicGridModule.vb
index 2f8690a..dd301ba 100644
--- a/Utility/DynamicGridModule.vb
+++ b/Utility/DynamicGridModule.vb
@@ -28,12 +28,10 @@ Module DynamicGridModule
       ' aggiungo LeftTrayV
       Grid.SetRow(m_LeftTrayV, 1)
       Grid.SetColumn(m_LeftTrayV, 0)
-      Grid.SetRowSpan(m_LeftTrayV, 2)
 
       ' aggiungo RightTrayV
       Grid.SetRow(m_RightTrayV, 1)
       Grid.SetColumn(m_RightTrayV, 2)
-      Grid.SetRowSpan(m_RightTrayV, 2)
 
       'aggiungo gridSplitter
       Grid.SetRow(gridSplitter, 1)
@@ -64,12 +62,10 @@ Module DynamicGridModule
       ' aggiungo RightTrayV
       Grid.SetRow(m_RightTrayV, 0)
       Grid.SetColumn(m_RightTrayV, 2)
-      Grid.SetRowSpan(m_RightTrayV, 2)
 
       'aggiungo gridSplitter
       Grid.SetRow(gridSplitter, 0)
       Grid.SetColumn(gridSplitter, 2)
-      Grid.SetRowSpan(gridSplitter, 2)
 
       ' aggiungo BottomTrayV
       Grid.SetRow(m_BottomTrayV, 2)
@@ -93,9 +89,9 @@ Module DynamicGridModule
          .Background = Brushes.Transparent
       }
       AddHandler gridSplitter.DragCompleted,
-                Sub()
-                   SaveGridLayout(If(IsActivePlugin(), PROJECT_EGTCAM5_PLUGIN, PROJECT_EGTCAM5))
-                End Sub
+         Sub()
+            SaveGridLayout(If(IsActivePlugin(), PROJECT_EGTCAM5_PLUGIN, PROJECT_EGTCAM5))
+         End Sub
 
       Return gridSplitter
    End Function
@@ -112,7 +108,8 @@ Module DynamicGridModule
          .Width = New GridLength(1, GridUnitType.Star)
       }
       Dim gridCol3 As New ColumnDefinition With {
-         .Width = New GridLength(250)
+         .Width = New GridLength(250),
+         .MinWidth = 150
       }
       ' aggiungo le colonne alla griglia
       Map.refProjectVM.DynamicGrid.ColumnDefinitions.Add(gridCol1)
@@ -168,9 +165,9 @@ Module DynamicGridModule
             Integer.TryParse(sValueParams(1), nDimType)
             StringToDoubleAdv(sValueParams(2), GridLenValue)
             If nDimType = 0 Then
-               Map.refProjectVM.DynamicGrid.ColumnDefinitions(2).Width = New GridLength(GridLenValue)
+               Map.refProjectVM.DynamicGrid.ColumnDefinitions(2).Width = New GridLength(GridLenValue, GridUnitType.Pixel)
             Else
-               Map.refProjectVM.DynamicGrid.RowDefinitions(IndexRow).Height = If(GridLenValue = 0, New GridLength(1, GridUnitType.Auto), New GridLength(GridLenValue))
+               Map.refProjectVM.DynamicGrid.RowDefinitions(IndexRow).Height = If(GridLenValue = 0, New GridLength(1, GridUnitType.Auto), New GridLength(GridLenValue, GridUnitType.Star))
                IndexRow += 1
             End If
          End If
@@ -235,6 +232,12 @@ Module DynamicGridModule
          Else
             MachGrid.RowDefinitions(1).Height = New GridLength(GridLenValue)
          End If
+      Else
+         If RowId = "ManageLayer" Then
+            MachGrid.RowDefinitions(0).Height = New GridLength(400)
+         Else
+            MachGrid.RowDefinitions(1).Height = New GridLength(150)
+         End If
       End If
    End Sub