diff --git a/Smartway.UiComponent.Sample/Inputs/Views/Inputs.xaml b/Smartway.UiComponent.Sample/Inputs/Views/Inputs.xaml
index 6c7f169..c7a43cd 100644
--- a/Smartway.UiComponent.Sample/Inputs/Views/Inputs.xaml
+++ b/Smartway.UiComponent.Sample/Inputs/Views/Inputs.xaml
@@ -142,7 +142,6 @@
                             Date="{Binding Date}"/>
                         <Label Text="{Binding Date, StringFormat='Date selectionnée: {0}'}"/>
                         <inputs:NumericDateEntry
-                            GlobalFontSize="17"
                             Margin="70, 0"
                             DatePlaceholder="{Binding MinimumDate}"
                             ErrorCommand="{Binding ErrorDateCommand}"/>
diff --git a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
index 057f3f3..370c525 100644
--- a/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
+++ b/Smartway.UiComponent/Inputs/NumericDateEntry.xaml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Grid xmlns="http://xamarin.com/schemas/2014/forms"
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Smartway.UiComponent.Inputs.NumericDateEntry"
     x:Name="Self"
     HorizontalOptions="Center"
-    ColumnDefinitions="*, Auto, *, Auto, *">
-    <Grid.Resources>
+    Orientation="Horizontal">
+    <StackLayout.Resources>
         <ResourceDictionary>
             <Style TargetType="Label">
                 <Setter Property="FontFamily" Value="OpenSans"/>
@@ -23,10 +23,10 @@
                 <Setter Property="MaxLength" Value="2" />
             </Style>
         </ResourceDictionary>
-    </Grid.Resources>
+    </StackLayout.Resources>
     <Entry x:Name="FirstEntry" Grid.Column="0" Focused="OnFocusedSelectAllEntryContent"/>
     <Label Grid.Column="1" Text="/"/>
     <Entry x:Name="SecondEntry" Grid.Column="2" Focused="OnFocusedSelectAllEntryContent"/>
     <Label Grid.Column="3" Text="/"/>
     <Entry x:Name="ThirdEntry" Grid.Column="4" Focused="OnFocusedSelectAllEntryContent"/>
-</Grid>
\ No newline at end of file
+</StackLayout>
\ No newline at end of file