diff --git a/ConstMsg.vb b/ConstMsg.vb
index 0483f39..c396e0c 100644
--- a/ConstMsg.vb
+++ b/ConstMsg.vb
@@ -1,7 +1,7 @@
 Module ConstMsg
 
     Public Const MSG_MISSINGKEYWD As Integer = 10100
-    Public Const MSG_NUMERICkEYBOARD As Integer = 10200
+    Public Const MSG_NUMERICKEYBOARD As Integer = 10200
     Public Const MSG_GENERAL As Integer = 101000
     Public Const MSG_IMPORTPAGEUC As Integer = 101100
     Public Const MSG_DRAWPAGEUC As Integer = 101200
diff --git a/DrawPageUC.xaml b/DrawPageUC.xaml
index 7e2ce4e..000e135 100644
--- a/DrawPageUC.xaml
+++ b/DrawPageUC.xaml
@@ -23,7 +23,7 @@
             <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
 
-        <!-- Definizione della Grid Inferiore per i Button V e X -->
+        <!-- Definizione della Grid Laterale -->
         <Grid Grid.RowSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1.5*"/>
@@ -41,7 +41,6 @@
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1*"/>
-                
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
             
diff --git a/NumericKeyboardWD.xaml.vb b/NumericKeyboardWD.xaml.vb
index d941f68..6d9ee6a 100644
--- a/NumericKeyboardWD.xaml.vb
+++ b/NumericKeyboardWD.xaml.vb
@@ -10,7 +10,7 @@ Public Class NumericKeyboardWD
     Dim m_bErrorState As Boolean = False
 
     Private Sub NumericKeyboardWD_Initialized(sender As Object, e As EventArgs)
-        m_sErrorString = EgtMsg(MSG_NUMERICkEYBOARD + 1)
+        m_sErrorString = EgtMsg(MSG_NUMERICKEYBOARD + 1)
     End Sub
 
     Private Sub NumericKeyboardWD_IsVisibleChanged(sender As Object, e As DependencyPropertyChangedEventArgs)
diff --git a/OptionsPageUC.xaml b/OptionsPageUC.xaml
index aed9fc4..c73f3d5 100644
--- a/OptionsPageUC.xaml
+++ b/OptionsPageUC.xaml
@@ -4,27 +4,58 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
-             d:DesignHeight="704" d:DesignWidth="1024" >
+             d:DesignHeight="704" d:DesignWidth="1024" Initialized="OptionsPage_Initialized" >
 
     <!-- Chiamata al Dictionary -->
     <UserControl.Resources>
         <ResourceDictionary Source="SarmaxWallDictionary.xaml"/>
     </UserControl.Resources>
-    
+
     <!-- Definizione della ImportPage -->
     <Grid Name="OptionsPageGrid" >
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="11*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="9*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="5*"/>
             <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
+        
+        <TextBlock Name="ExtraRawPartXLbl" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"
+            FontSize="15" TextWrapping="WrapWithOverflow" Width="180" TextAlignment="Center" />
+        <TextBox Name="ExtraRawPartXTxBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource NumericKeyboard}"
+            FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+            TextAlignment="Right"/>
+        <TextBlock Name="ExtraRawPartYLbl" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"
+            FontSize="15" TextWrapping="WrapWithOverflow" Width="180" TextAlignment="Center" />
+        <TextBox Name="ExtraRawPartYTxBx" Grid.Column="1" Grid.Row="1" Style="{StaticResource NumericKeyboard}"
+            FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+            TextAlignment="Right"/>
+        <TextBlock Name="ExtraGlueLbl" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center"
+            FontSize="15" TextWrapping="WrapWithOverflow" Width="180" TextAlignment="Center" />
+        <TextBox Name="ExtraGlueTxBx" Grid.Column="1" Grid.Row="2" Style="{StaticResource NumericKeyboard}"
+            FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+            TextAlignment="Right"/>
+        <TextBlock Name="PlankWidthLbl" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center"
+            FontSize="15" TextWrapping="WrapWithOverflow" Width="180" TextAlignment="Center" />
+        <TextBox Name="PlankWidthTxBx" Grid.Column="1" Grid.Row="3" Style="{StaticResource NumericKeyboard}"
+            FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+            TextAlignment="Right"/>
+        <TextBlock Name="PlankNumForLayerLbl" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Center"
+            FontSize="15" TextWrapping="WrapWithOverflow" Width="180" TextAlignment="Center" />
+        <TextBox Name="PlankNumForLayerTxBx" Grid.Column="1" Grid.Row="4" Style="{StaticResource NumericKeyboard}"
+            FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+            TextAlignment="Right"/>
 
         <!-- Definizione della Grid Inferiore per i Button V e X -->
-        <Grid Grid.Column="1" Grid.Row="2">
+        <Grid Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="10*"/>
                 <ColumnDefinition Width="1*"/>
@@ -39,6 +70,6 @@
                 VerticalAlignment="Center" />
             </Button>
         </Grid>
-        
+
     </Grid>
 </UserControl>
diff --git a/OptionsPageUC.xaml.vb b/OptionsPageUC.xaml.vb
index c3e05da..9f3c348 100644
--- a/OptionsPageUC.xaml.vb
+++ b/OptionsPageUC.xaml.vb
@@ -1,7 +1,37 @@
-Public Class OptionsPageUC
+Imports EgtUILib
+
+Public Class OptionsPageUC
 
     Dim m_MainWindow As MainWindow = Application.Current.MainWindow
 
+    Private Sub OptionsPage_Initialized(sender As Object, e As EventArgs)
+
+        'Imposto i messaggi letti dal file dei messaggi
+        ExtraRawPartXLbl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 1)           'Generate - Extra grezzo in X
+        ExtraRawPartYLbl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 2)           'Send - Trasmetti
+        ExtraGlueLbl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 3)               'Send - Trasmetti
+        PlankWidthLbl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 4)              'Send - Trasmetti
+        PlankNumForLayerLbl.Text = EgtMsg(MSG_OPTIONSPAGEUC + 5)        'Send - Trasmetti
+
+        ' Associo TextBox e Label
+        Dim TempLabel1 As New Label
+        TempLabel1.Content = ExtraRawPartXLbl.Text
+        ExtraRawPartXTxBx.Tag = TempLabel1
+        Dim TempLabel2 As New Label
+        TempLabel2.Content = ExtraRawPartYLbl.Text
+        ExtraRawPartYTxBx.Tag = TempLabel2
+        Dim TempLabel3 As New Label
+        TempLabel3.Content = ExtraGlueLbl.Text
+        ExtraGlueTxBx.Tag = TempLabel3
+        Dim TempLabel4 As New Label
+        TempLabel4.Content = PlankWidthLbl.Text
+        PlankWidthTxBx.Tag = TempLabel4
+        Dim TempLabel5 As New Label
+        TempLabel5.Content = PlankNumForLayerLbl.Text
+        PlankNumForLayerTxBx.Tag = TempLabel5
+
+    End Sub
+
     Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
         'Istruzioni per chiudere OptionsPageUC e aprire PlacePage UC
         m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_OptionsPageUC)
diff --git a/PlacePageUC.xaml b/PlacePageUC.xaml
index 30c42c1..5ccb3bd 100644
--- a/PlacePageUC.xaml
+++ b/PlacePageUC.xaml
@@ -38,7 +38,8 @@
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
-                <RowDefinition Height="2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <Label Name="WallPositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
@@ -96,7 +97,16 @@
                     FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
                     TextAlignment="Right"/>
             </UniformGrid>
-            
+
+            <UniformGrid Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="3" Columns="2">
+                <TextBlock Name="PlankNumFirstLayerLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
+                    HorizontalAlignment="Center" FontSize="15" TextWrapping="WrapWithOverflow" Width="75"
+                    TextAlignment="Center" />
+                <TextBox Name="PlankNumFirstLayerTxBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource NumericKeyboard}"
+                    FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
+                    TextAlignment="Right"/>
+            </UniformGrid>
+
         </Grid>
 
       <Border Name="MessageBrd" Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="Gray">
diff --git a/PlacePageUC.xaml.vb b/PlacePageUC.xaml.vb
index a2d36b1..ba96d24 100644
--- a/PlacePageUC.xaml.vb
+++ b/PlacePageUC.xaml.vb
@@ -66,11 +66,15 @@ Public Class PlacePageUC
         StoreWallTxt.Text = EgtMsg(MSG_PLACEPAGEUC + 5)             'Store wall - Parcheggia parete
         RemoveWallBtn.Content = EgtMsg(MSG_PLACEPAGEUC + 6)         'Remove wall - Elimina parete
         LayerThicknessLbl.Text = EgtMsg(MSG_PLACEPAGEUC + 7)        'Layer thickness - Spessore strato
+        PlankNumFirstLayerLbl.Text = EgtMsg(MSG_PLACEPAGEUC + 8)    '    - Numero tavola primo piano
 
         ' Associo TextBox e Label
-        Dim TempLabel As New Label
-        TempLabel.Content = LayerThicknessLbl.Text
-        LayerThicknessTxBx.Tag = TempLabel
+        Dim TempLabel1 As New Label
+        TempLabel1.Content = LayerThicknessLbl.Text
+        LayerThicknessTxBx.Tag = TempLabel1
+        Dim TempLabel2 As New Label
+        TempLabel2.Content = PlankNumFirstLayerLbl.Text
+        PlankNumFirstLayerTxBx.Tag = TempLabel2
 
     End Sub