diff --git a/GMCabsDriverAssistantSolution/Views/UserRegistrationGenerateOtpPage.xaml b/GMCabsDriverAssistantSolution/Views/UserRegistrationGenerateOtpPage.xaml
index c0d6d3b..9d57219 100644
--- a/GMCabsDriverAssistantSolution/Views/UserRegistrationGenerateOtpPage.xaml
+++ b/GMCabsDriverAssistantSolution/Views/UserRegistrationGenerateOtpPage.xaml
@@ -61,7 +61,8 @@
                                              MaxLength="10"
                                              Text="{Binding PhoneNumber}"
                                              Placeholder="Mobile Number"
-                                             Style="{StaticResource EntryStyle}"/>
+                                             Style="{StaticResource EntryStyle}"
+                                             Margin="0,0,0,-8"/>
                 </Grid>
             </Frame>
             <Button Text="REGISTER"
@@ -76,7 +77,7 @@
                    VerticalOptions="EndAndExpand"/>
             <Button Text="Back"
                     FontSize="20"
-                    Margin="{OnIdiom Phone='0,16,0,0',Tablet='270,0,270,0'}"
+                    Margin="{OnIdiom Phone='0,16,0,10',Tablet='270,0,270,0'}"
                     Command="{Binding Back}"/>
         </StackLayout>
     </ContentPage.Content>
diff --git a/GMCabsDriverAssistantSolution/Views/UserSignUpPage.xaml b/GMCabsDriverAssistantSolution/Views/UserSignUpPage.xaml
index d717e88..9d0b5f9 100644
--- a/GMCabsDriverAssistantSolution/Views/UserSignUpPage.xaml
+++ b/GMCabsDriverAssistantSolution/Views/UserSignUpPage.xaml
@@ -16,6 +16,7 @@
                 <Setter Property="PlaceholderColor" Value="#9999"></Setter>
                 <Setter Property="TranslationY"  Value="1" />
                 <Setter Property="MinimumHeightRequest" Value="36" />
+                <Setter Property="Margin" Value="0,10,0,-8"/>
             </Style>
             <Style x:Key="NoUnderlineEntryFrameStyle" TargetType="Frame">
                 <Setter Property="Padding">
@@ -46,8 +47,9 @@
                     <Label Text="Enter your details to complete your registration"
                    FontSize="Title"
                    HorizontalOptions="CenterAndExpand"
-                   TextColor="Black"/>
-                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                   TextColor="Black"
+                   Margin="15,15,15,5"/>
+                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="15,15,15,5">
                         <Grid MinimumHeightRequest="50" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="1"/>
@@ -62,8 +64,8 @@
                                              Style="{StaticResource EntryStyle}"/>
                         </Grid>
                     </Frame>
-                    <StackLayout Orientation="Horizontal">
-                        <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" WidthRequest="140" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                    <StackLayout Orientation="Horizontal" Margin="15,5,15,5">
+                        <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" WidthRequest="178" Margin="0,0,3,0">
                             <Grid MinimumHeightRequest="50" >
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1"/>
@@ -78,7 +80,7 @@
                                              Style="{StaticResource EntryStyle}"/>
                             </Grid>
                         </Frame>
-                        <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" WidthRequest="140" Margin="{OnIdiom Tablet='-243,0,0,0'}">
+                        <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" WidthRequest="178" Margin="3,0,0,0">
                             <Grid MinimumHeightRequest="50" >
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1"/>
@@ -94,7 +96,7 @@
                             </Grid>
                         </Frame>
                     </StackLayout>
-                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="15,5,15,5">
                         <Grid MinimumHeightRequest="50" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="1"/>
@@ -110,7 +112,7 @@
                                              Style="{StaticResource EntryStyle}"/>
                         </Grid>
                     </Frame>
-                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="15,5,15,5">
                         <Grid MinimumHeightRequest="50" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="1"/>
@@ -127,7 +129,7 @@
                                              Style="{StaticResource EntryStyle}"/>
                         </Grid>
                     </Frame>
-                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                    <Frame Style="{StaticResource NoUnderlineEntryFrameStyle}" Margin="15,5,15,5">
                         <Grid MinimumHeightRequest="50" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="1"/>
@@ -156,7 +158,7 @@
                         FontSize="20"
                         Command="{Binding SignUpCommand}"
                         IsVisible="{Binding IsBusy}"
-                        MinimumHeightRequest="40" Margin="{OnIdiom Tablet='270,0,270,0'}">
+                        MinimumHeightRequest="40" Margin="0,16,0,10">
                     <Button.Triggers>
                         <DataTrigger TargetType="Button" Binding="{Binding IsBusy}" Value="False">
                             <Setter Property="IsVisible" Value="True" />