diff --git a/MachiningDbPageUC.xaml b/MachiningDbPageUC.xaml
index 611871d..ce7b57e 100644
--- a/MachiningDbPageUC.xaml
+++ b/MachiningDbPageUC.xaml
@@ -302,67 +302,89 @@
                 </Border>
 
                 <Border Name="TypeBrd" Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" Grid.RowSpan="6"
-               Style="{DynamicResource OmagCut_NoNameGroupBorder}">
+                   Style="{DynamicResource OmagCut_NoNameGroupBorder}">
+                   
+                   <Grid Name="TypeGrd">
+                      <Grid.ColumnDefinitions>
+                         <ColumnDefinition Width="2*"/>
+                         <ColumnDefinition Width="2*"/>
+                         <ColumnDefinition Width="2*"/>
+                         <ColumnDefinition Width="2*"/>
+                      </Grid.ColumnDefinitions>
+                      <Grid.RowDefinitions>
+                         <RowDefinition Height="1*"/>
+                         <RowDefinition Height="1*"/>
+                      </Grid.RowDefinitions>
+                   
+                      <TextBlock Name="StartPosTxBl" Grid.Column="0" Grid.Row="0"
+                         Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                      <EgtWPFLib:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Grid.Row="0"
+                         Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
+                   
+                      <TextBlock Name="LeadInTypeTxBl" Grid.Column="2" Grid.Row="0"
+                         Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                      <ComboBox Name="LeadInTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
+                         <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                         </ComboBox.ItemTemplate>
+                      </ComboBox>
+                   
+                      <!--Questo è solo per sgrossatura con lama-->
+                      <TextBlock Name="LeadLinkTypeTxBl" Grid.Column="2" Grid.Row="0"
+                         Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                      <ComboBox Name="LeadLinkTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
+                         <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                         </ComboBox.ItemTemplate>
+                      </ComboBox>
+                   
+                      <TextBlock Name="ExtLinkTypeTxBl" Grid.Column="0" Grid.Row="1"
+                         Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                      <ComboBox Name="ExtLinkTypeCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
+                         <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                         </ComboBox.ItemTemplate>
+                      </ComboBox>
+                   
+                      <TextBlock Name="LeadOutTypeTxBl" Grid.Column="2" Grid.Row="1"
+                         Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                      <ComboBox Name="LeadOutTypeCmBx" Grid.Column="3" Grid.Row="1" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
+                         <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                               <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                         </ComboBox.ItemTemplate>
+                      </ComboBox>
 
-               <Grid Name="TypeGrd">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
+                        <!--Le seguenti sono solo per WaterJetting-->
 
-                  <TextBlock Name="StartPosTxBl" Grid.Column="0" Grid.Row="0"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="StartPosTxBx" Grid.Column="1" Grid.Row="0"
-                     Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
+                        <TextBlock Name="LiTangTxBl" Grid.Column="0" Grid.Row="1"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="LiTangTxBx" Grid.Column="1" Grid.Row="1"
+                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
-                  <TextBlock Name="LeadInTypeTxBl" Grid.Column="2" Grid.Row="0"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <ComboBox Name="LeadInTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
+                        <TextBlock Name="LiPerpTxBl" Grid.Column="0" Grid.Row="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="LiPerpTxBx" Grid.Column="1" Grid.Row="2"
+                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
-                  <!--Questo è solo per sgrossatura con lama-->
-                  <TextBlock Name="LeadLinkTypeTxBl" Grid.Column="2" Grid.Row="0"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <ComboBox Name="LeadLinkTypeCmBx" Grid.Column="3" Grid.Row="0" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
+                        <TextBlock Name="LoTangTxBl" Grid.Column="2" Grid.Row="1"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="LoTangTxBx" Grid.Column="3" Grid.Row="1"
+                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
-                  <TextBlock Name="ExtLinkTypeTxBl" Grid.Column="0" Grid.Row="1"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <ComboBox Name="ExtLinkTypeCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
+                        <TextBlock Name="LoPerpTxBl" Grid.Column="2" Grid.Row="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="LoPerpTxBx" Grid.Column="3" Grid.Row="2"
+                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
-                  <TextBlock Name="LeadOutTypeTxBl" Grid.Column="2" Grid.Row="1"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <ComboBox Name="LeadOutTypeCmBx" Grid.Column="3" Grid.Row="1" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-
-               </Grid>
+                    </Grid>
 
             </Border>
 
@@ -546,56 +568,8 @@
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                 <EgtWPFLib:EgtTextBox Name="ForwardAngleTxBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3"
                      Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-                
-                <Border Name="CornTypeBrd" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="4" Grid.RowSpan="3"
-               Style="{DynamicResource OmagCut_NoNameGroupBorder}">
 
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="2*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-
-                        <TextBlock Name="ExtCornTypeTxBl" Grid.Column="0"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <ComboBox Name="ExtCornTypeCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-
-                        <TextBlock Name="IntCornTypeTxBl" Grid.Column="2"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <ComboBox Name="IntCornTypeCmBx" Grid.Column="4" Grid.Row="5" Style="{StaticResource OmagCut_RightComboBoxInBorder}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-
-                    </Grid>
-
-                </Border>
-
-                <TextBlock Name="CornSlowLenTxBl" Grid.Column="0" Grid.Row="18" Grid.RowSpan="3"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="CornSlowLenTxBx" Grid.Column="1" Grid.Row="18" Grid.RowSpan="3"
-                     Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                <TextBlock Name="CornSlowPercTxBl" Grid.Column="2" Grid.Row="18" Grid.RowSpan="3"
-                     Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="CornSlowPercTxBx" Grid.Column="3" Grid.Row="18" Grid.RowSpan="3"
-                     Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                <Border Name="LiHoleBrd" Grid.Column="0" Grid.Row="21" Grid.ColumnSpan="4" Grid.RowSpan="6"
+                <Border Name="LiHoleBrd" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="6"
                Style="{DynamicResource OmagCut_NoNameGroupBorder}">
 
                     <Grid>
@@ -823,8 +797,55 @@
 
             </GroupBox>
 
-                <Border Name="ProbingBrd" Grid.Column="0" Grid.Row="27" Grid.ColumnSpan="2" Grid.RowSpan="9"
-               Style="{DynamicResource OmagCut_NoNameGroupBorder}">
+            <GroupBox Name="CornerGpBx" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="2" Grid.RowSpan="12" 
+               Style="{DynamicResource OmagCut_GroupBox}">
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="2*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Name="ExtCornTypeTxBl" Grid.Column="0" Grid.Row="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <ComboBox Name="ExtCornTypeCmBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <TextBlock Name="IntCornTypeTxBl" Grid.Column="0" Grid.Row="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <ComboBox Name="IntCornTypeCmBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource OmagCut_LeftComboBoxInBorder}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <TextBlock Name="CornSlowLenTxBl" Grid.Column="0" Grid.Row="2" 
+                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="CornSlowLenTxBx" Grid.Column="1" Grid.Row="2" 
+                                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
+
+                        <TextBlock Name="CornSlowPercTxBl" Grid.Column="0" Grid.Row="3" 
+                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                        <EgtWPFLib:EgtTextBox Name="CornSlowPercTxBx" Grid.Column="1" Grid.Row="3" 
+                                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
+
+                    </Grid>
+
+            </GroupBox>
+
+                <GroupBox Name="ProbingGpBx" Grid.Column="0" Grid.Row="27" Grid.ColumnSpan="2" Grid.RowSpan="9"
+                    Style="{DynamicResource OmagCut_GroupBox}">
 
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -853,47 +874,7 @@
 
                     </Grid>
 
-                </Border>
-
-                <Border Name="LiLoTangPerpBrd" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="2" Grid.RowSpan="12"
-               Style="{DynamicResource OmagCut_NoNameGroupBorder}">
-
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="2*"/>
-                            <ColumnDefinition Width="2*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-
-                        <TextBlock Name="LiTangTxBl" Grid.Column="0" Grid.Row="0"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LiTangTxBx" Grid.Column="1" Grid.Row="0"
-                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                        <TextBlock Name="LiPerpTxBl" Grid.Column="0" Grid.Row="1"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LiPerpTxBx" Grid.Column="1" Grid.Row="1"
-                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                        <TextBlock Name="LoTangTxBl" Grid.Column="0" Grid.Row="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LoTangTxBx" Grid.Column="1" Grid.Row="2"
-                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                        <TextBlock Name="LoPerpTxBl" Grid.Column="0" Grid.Row="3"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LoPerpTxBx" Grid.Column="1" Grid.Row="3"
-                             Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
-
-                    </Grid>
-
-                </Border>
-
+                </GroupBox>
 
             </Grid>
 
diff --git a/MachiningDbPageUC.xaml.vb b/MachiningDbPageUC.xaml.vb
index 87a450c..d094a41 100644
--- a/MachiningDbPageUC.xaml.vb
+++ b/MachiningDbPageUC.xaml.vb
@@ -52,9 +52,7 @@ Public Class MachiningDbPageUC
       ' Imposto testo delle combobox da file dei messaggi
       WorkSide = {EgtMsg(MSG_COMBOBOXPARAM + 21), EgtMsg(MSG_COMBOBOXPARAM + 22), EgtMsg(MSG_COMBOBOXPARAM + 23)}
       HeadSide = {EgtMsg(MSG_COMBOBOXPARAM + 22), EgtMsg(MSG_COMBOBOXPARAM + 23)}
-      'LeadInType = {EgtMsg(MSG_COMBOBOXPARAM + 24), EgtMsg(MSG_COMBOBOXPARAM + 25), EgtMsg(MSG_COMBOBOXPARAM + 26), EgtMsg(MSG_COMBOBOXPARAM + 27), EgtMsg(MSG_COMBOBOXPARAM + 28)}
       ExtLinkType = {EgtMsg(MSG_COMBOBOXPARAM + 24), EgtMsg(MSG_COMBOBOXPARAM + 29), EgtMsg(MSG_COMBOBOXPARAM + 30), EgtMsg(MSG_COMBOBOXPARAM + 31)}
-      'LeadOutType = {EgtMsg(MSG_COMBOBOXPARAM + 32), EgtMsg(MSG_COMBOBOXPARAM + 33), EgtMsg(MSG_COMBOBOXPARAM + 34)}
       LeadLinkType = {EgtMsg(MSG_COMBOBOXPARAM + 24), EgtMsg(MSG_COMBOBOXPARAM + 26)}
       LeLiFinType = {EgtMsg(MSG_COMBOBOXPARAM + 42), EgtMsg(MSG_COMBOBOXPARAM + 24), EgtMsg(MSG_COMBOBOXPARAM + 26)}
       CurveUse = {EgtMsg(MSG_COMBOBOXPARAM + 35), EgtMsg(MSG_COMBOBOXPARAM + 36), EgtMsg(MSG_COMBOBOXPARAM + 37), EgtMsg(MSG_COMBOBOXPARAM + 41)}
@@ -129,7 +127,9 @@ Public Class MachiningDbPageUC
       MaxThicknessTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 26)
 
       ForwardAngleTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 107)
-      ProbingTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 108)
+      CornerGpBx.Header = EgtMsg(MSG_MACHININGSDBPAGEUC + 120)
+      ProbingGpBx.Header = EgtMsg(MSG_MACHININGSDBPAGEUC + 108)
+      ProbingTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 119)
       ProbingMinDistTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 109)
       ProbingMaxDistTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 110)
       ExtCornTypeTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 111)
@@ -671,12 +671,28 @@ Public Class MachiningDbPageUC
             StepTypeTxBl.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.ItemsSource = StepType
+            SideBrd.SetValue(Grid.RowProperty, 9)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Visible
             WorkSideCmBx.Visibility = Windows.Visibility.Visible
             HeadSideTxBl.Visibility = Windows.Visibility.Visible
             HeadSideCmBx.Visibility = Windows.Visibility.Visible
             TypeBrd.Visibility = Windows.Visibility.Visible
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
+                  TypeGrd.RowDefinitions.RemoveAt(Index)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 12)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            End If
             LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
             ExtLinkTypeTxBl.Visibility = Windows.Visibility.Visible
@@ -744,7 +760,7 @@ Public Class MachiningDbPageUC
             ReturnPosTxBx.Visibility = Windows.Visibility.Hidden
             OffsetGpBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
                For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -776,14 +792,14 @@ Public Class MachiningDbPageUC
             BackFeedTxBx.Visibility = Windows.Visibility.Visible
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -801,7 +817,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.MILLING 'Parametri Fresatura
             SideAngleTxBl.Visibility = Windows.Visibility.Hidden
             SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -811,12 +834,28 @@ Public Class MachiningDbPageUC
             AcrossChBx.Visibility = Windows.Visibility.Hidden
             StepTypeTxBl.Visibility = Windows.Visibility.Hidden
             StepTypeCmBx.Visibility = Windows.Visibility.Hidden
+            SideBrd.SetValue(Grid.RowProperty, 9)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Visible
             WorkSideCmBx.Visibility = Windows.Visibility.Visible
             HeadSideTxBl.Visibility = Windows.Visibility.Hidden
             HeadSideCmBx.Visibility = Windows.Visibility.Hidden
             TypeBrd.Visibility = Windows.Visibility.Visible
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
+                  TypeGrd.RowDefinitions.RemoveAt(Index)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 12)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            End If
             LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
             ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -881,7 +920,7 @@ Public Class MachiningDbPageUC
             ReturnPosTxBx.Visibility = Windows.Visibility.Hidden
             OffsetGpBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
                For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -913,14 +952,14 @@ Public Class MachiningDbPageUC
             BackFeedTxBx.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -938,7 +977,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.DRILLING 'Parametri Foratura
             SideAngleTxBl.Visibility = Windows.Visibility.Hidden
             SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -1022,14 +1068,14 @@ Public Class MachiningDbPageUC
             BackFeedTxBx.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1047,7 +1093,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.SAWROUGHING   'Parametri Sgrossatura con lama
             SideAngleTxBl.Visibility = Windows.Visibility.Hidden
             SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -1058,12 +1111,28 @@ Public Class MachiningDbPageUC
             StepTypeTxBl.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.ItemsSource = RouFinStepType
+            SideBrd.SetValue(Grid.RowProperty, 9)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Hidden
             WorkSideCmBx.Visibility = Windows.Visibility.Hidden
             HeadSideTxBl.Visibility = Windows.Visibility.Visible
             HeadSideCmBx.Visibility = Windows.Visibility.Visible
             TypeBrd.Visibility = Windows.Visibility.Visible
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
+                  TypeGrd.RowDefinitions.RemoveAt(Index)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 12)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            End If
             LeadInTypeTxBl.Visibility = Windows.Visibility.Hidden
             LeadInTypeCmBx.Visibility = Windows.Visibility.Hidden
             ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1118,7 +1187,7 @@ Public Class MachiningDbPageUC
             LonOffsetTxBl.Visibility = Windows.Visibility.Visible
             LonOffsetTxBx.Visibility = Windows.Visibility.Visible
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
                For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -1163,14 +1232,14 @@ Public Class MachiningDbPageUC
             End If
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1188,7 +1257,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.SAWFINISHING   'Parametri Finitura con lama
             SideAngleTxBl.Visibility = Windows.Visibility.Hidden
             SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -1199,12 +1275,28 @@ Public Class MachiningDbPageUC
             StepTypeTxBl.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.Visibility = Windows.Visibility.Visible
             StepTypeCmBx.ItemsSource = RouFinStepType
+            SideBrd.SetValue(Grid.RowProperty, 9)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Hidden
             WorkSideCmBx.Visibility = Windows.Visibility.Hidden
             HeadSideTxBl.Visibility = Windows.Visibility.Visible
             HeadSideCmBx.Visibility = Windows.Visibility.Visible
             TypeBrd.Visibility = Windows.Visibility.Visible
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
+                  TypeGrd.RowDefinitions.RemoveAt(Index)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 12)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            End If
             LeadInTypeTxBl.Visibility = Windows.Visibility.Hidden
             LeadInTypeCmBx.Visibility = Windows.Visibility.Hidden
             ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1259,7 +1351,7 @@ Public Class MachiningDbPageUC
             LonOffsetTxBl.Visibility = Windows.Visibility.Hidden
             LonOffsetTxBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
                For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -1301,14 +1393,14 @@ Public Class MachiningDbPageUC
             End If
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1326,7 +1418,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.POCKETING 'Parametri Svuotatura
             SideAngleTxBl.Visibility = Windows.Visibility.Hidden
             SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -1336,12 +1435,28 @@ Public Class MachiningDbPageUC
             AcrossChBx.Visibility = Windows.Visibility.Hidden
             StepTypeTxBl.Visibility = Windows.Visibility.Hidden
             StepTypeCmBx.Visibility = Windows.Visibility.Hidden
+            SideBrd.SetValue(Grid.RowProperty, 9)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Visible
             WorkSideCmBx.Visibility = Windows.Visibility.Visible
             HeadSideTxBl.Visibility = Windows.Visibility.Hidden
             HeadSideCmBx.Visibility = Windows.Visibility.Hidden
             TypeBrd.Visibility = Windows.Visibility.Visible
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
+                  TypeGrd.RowDefinitions.RemoveAt(Index)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 12)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            End If
             LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
             ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1406,7 +1521,7 @@ Public Class MachiningDbPageUC
             ReturnPosTxBx.Visibility = Windows.Visibility.Hidden
             OffsetGpBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
                For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -1438,14 +1553,14 @@ Public Class MachiningDbPageUC
             BackFeedTxBx.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-            ProbingBrd.Visibility = Windows.Visibility.Hidden
+            CornerGpBx.Visibility = Windows.Visibility.Hidden
+            ProbingGpBx.Visibility = Windows.Visibility.Hidden
             ProbingTxBl.Visibility = Windows.Visibility.Hidden
             ProbingChBx.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-            CornTypeBrd.Visibility = Windows.Visibility.Hidden
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
             IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1463,7 +1578,14 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
             HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
+            LiTangTxBl.Visibility = Windows.Visibility.Hidden
+            LiTangTxBx.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LiPerpTxBx.Visibility = Windows.Visibility.Hidden
+            LoTangTxBl.Visibility = Windows.Visibility.Hidden
+            LoTangTxBx.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBl.Visibility = Windows.Visibility.Hidden
+            LoPerpTxBx.Visibility = Windows.Visibility.Hidden
          Case MCH_MY.WATERJETTING 'Parametri WaterJetting
             DepthTxBl.Visibility = Windows.Visibility.Hidden
             DepthTxBx.Visibility = Windows.Visibility.Hidden
@@ -1475,11 +1597,30 @@ Public Class MachiningDbPageUC
             AcrossChBx.Visibility = Windows.Visibility.Hidden
             StepTypeTxBl.Visibility = Windows.Visibility.Hidden
             StepTypeCmBx.Visibility = Windows.Visibility.Hidden
+            SideBrd.SetValue(Grid.RowProperty, 3)
             SideBrd.Visibility = Windows.Visibility.Visible
             WorkSideTxBl.Visibility = Windows.Visibility.Visible
             WorkSideCmBx.Visibility = Windows.Visibility.Visible
             HeadSideTxBl.Visibility = Windows.Visibility.Hidden
             HeadSideCmBx.Visibility = Windows.Visibility.Hidden
+            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
+            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
+            If RowNum < 3 Then
+               For Index = RowNum To 2
+                  Dim Row As New RowDefinition
+                  Row.Height = New GridLength(1, GridUnitType.Star)
+                  ' Row.SetValue(Grid.RowSpanProperty, 3)
+                  TypeGrd.RowDefinitions.Add(Row)
+               Next
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 0)
+               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 0)
+               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               TypeBrd.SetValue(Grid.RowProperty, 15)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 9)
+            End If
             TypeBrd.Visibility = Windows.Visibility.Visible
             LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
@@ -1547,7 +1688,7 @@ Public Class MachiningDbPageUC
             LonOffsetTxBl.Visibility = Windows.Visibility.Hidden
             LonOffsetTxBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
-            Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
+            RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 2 Then
                For Index = RowNum - 1 To 2 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
@@ -1576,14 +1717,14 @@ Public Class MachiningDbPageUC
             EndFeedTxBx.Visibility = Windows.Visibility.Hidden
             ForwardAngleTxBl.Visibility = Windows.Visibility.Visible
             ForwardAngleTxBx.Visibility = Windows.Visibility.Visible
-            ProbingBrd.Visibility = Windows.Visibility.Visible
+            CornerGpBx.Visibility = Windows.Visibility.Visible
+            ProbingGpBx.Visibility = Windows.Visibility.Visible
             ProbingTxBl.Visibility = Windows.Visibility.Visible
             ProbingChBx.Visibility = Windows.Visibility.Visible
             ProbingMinDistTxBl.Visibility = Windows.Visibility.Visible
             ProbingMinDistTxBx.Visibility = Windows.Visibility.Visible
             ProbingMaxDistTxBl.Visibility = Windows.Visibility.Visible
             ProbingMaxDistTxBx.Visibility = Windows.Visibility.Visible
-            CornTypeBrd.Visibility = Windows.Visibility.Visible
             ExtCornTypeTxBl.Visibility = Windows.Visibility.Visible
             ExtCornTypeCmBx.Visibility = Windows.Visibility.Visible
             IntCornTypeTxBl.Visibility = Windows.Visibility.Visible
@@ -1601,7 +1742,6 @@ Public Class MachiningDbPageUC
             LpTurnsTxBx.Visibility = Windows.Visibility.Visible
             HpTurnsTxBl.Visibility = Windows.Visibility.Visible
             HpTurnsTxBx.Visibility = Windows.Visibility.Visible
-            LiLoTangPerpBrd.Visibility = Windows.Visibility.Visible
             LiTangTxBl.Visibility = Windows.Visibility.Visible
             LiTangTxBx.Visibility = Windows.Visibility.Visible
             LiPerpTxBl.Visibility = Windows.Visibility.Visible
@@ -1660,14 +1800,14 @@ Public Class MachiningDbPageUC
       'Parametri WaterJetting
       ForwardAngleTxBl.Visibility = Windows.Visibility.Hidden
       ForwardAngleTxBx.Visibility = Windows.Visibility.Hidden
-      ProbingBrd.Visibility = Windows.Visibility.Hidden
+      CornerGpBx.Visibility = Windows.Visibility.Hidden
+      ProbingGpBx.Visibility = Windows.Visibility.Hidden
       ProbingTxBl.Visibility = Windows.Visibility.Hidden
       ProbingChBx.Visibility = Windows.Visibility.Hidden
       ProbingMinDistTxBl.Visibility = Windows.Visibility.Hidden
       ProbingMinDistTxBx.Visibility = Windows.Visibility.Hidden
       ProbingMaxDistTxBl.Visibility = Windows.Visibility.Hidden
       ProbingMaxDistTxBx.Visibility = Windows.Visibility.Hidden
-      CornTypeBrd.Visibility = Windows.Visibility.Hidden
       ExtCornTypeTxBl.Visibility = Windows.Visibility.Hidden
       ExtCornTypeCmBx.Visibility = Windows.Visibility.Hidden
       IntCornTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1685,7 +1825,6 @@ Public Class MachiningDbPageUC
       LpTurnsTxBx.Visibility = Windows.Visibility.Hidden
       HpTurnsTxBl.Visibility = Windows.Visibility.Hidden
       HpTurnsTxBx.Visibility = Windows.Visibility.Hidden
-      LiLoTangPerpBrd.Visibility = Windows.Visibility.Hidden
    End Sub
 
    Private Sub MachiningTreeView_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs) Handles MachiningTreeView.PreviewMouseUp
@@ -1845,15 +1984,9 @@ Public Class MachiningDbPageUC
          Case MCH_MY.MILLING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
                                           {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
-                                           New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
-                                           New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47)),
-                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
-                                           New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_COMBOBOXPARAM + 38)),
-                                           New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_COMBOBOXPARAM + 49))})
+                                           New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
                                          {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_COMBOBOXPARAM + 43)),
-                                          New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_COMBOBOXPARAM + 46)),
-                                          New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_COMBOBOXPARAM + 47)),
                                           New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                           New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_COMBOBOXPARAM + 50))})
          Case MCH_MY.POCKETING
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 9680976..dcd8994 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.10.5")>
-<Assembly: AssemblyFileVersion("2.1.10.5")>
+<Assembly: AssemblyVersion("2.1.10.6")>
+<Assembly: AssemblyFileVersion("2.1.10.6")>