diff --git a/Library/Presentation/View/Product/ProductMasterView.xaml b/Library/Presentation/View/Product/ProductMasterView.xaml
index 1b9b748..b0d9fb7 100644
--- a/Library/Presentation/View/Product/ProductMasterView.xaml
+++ b/Library/Presentation/View/Product/ProductMasterView.xaml
@@ -120,6 +120,21 @@
                 </Validation.ErrorTemplate>
             </TextBox>
 
+            <Label Content="Pages:" FontSize="10"/>
+            <TextBox Height="20" Width="120" Margin="50,0,10,0"
+             Text="{Binding Pages, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"
+             TextWrapping="Wrap"
+             BorderBrush="Gray">
+                <Validation.ErrorTemplate>
+                    <ControlTemplate>
+                        <StackPanel>
+                            <AdornedElementPlaceholder x:Name="placeholder"/>
+                            <TextBlock Text="{Binding [0].ErrorContent}" Foreground="Red"/>
+                        </StackPanel>
+                    </ControlTemplate>
+                </Validation.ErrorTemplate>
+            </TextBox>
+
             <Label Content="Publisher:" FontSize="10"/>
             <TextBox Height="20" Width="120" Margin="50,0,10,0"
                          Text="{Binding Publisher, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}"
@@ -151,7 +166,7 @@
             </TextBox>
 
         </StackPanel>
-        <Button Content="Create" Margin="46,287,46,99" Background="CornflowerBlue"
+        <Button Content="Create" Margin="46,329,46,57" Background="CornflowerBlue"
                         Command="{Binding CreateProduct}" Grid.Column="1" Grid.Row="1"/>
         <Label Margin="0,20,0,506"
                        HorizontalAlignment="Center"
diff --git a/Library/Presentation/ViewModel/Product/ProductMasterViewModel.cs b/Library/Presentation/ViewModel/Product/ProductMasterViewModel.cs
index 68fbd9c..6148548 100644
--- a/Library/Presentation/ViewModel/Product/ProductMasterViewModel.cs
+++ b/Library/Presentation/ViewModel/Product/ProductMasterViewModel.cs
@@ -165,8 +165,8 @@ private bool CanStoreProduct()
             return !(
                 string.IsNullOrWhiteSpace(this.Name) ||
                 string.IsNullOrWhiteSpace(this.Price.ToString()) ||
-                string.IsNullOrWhiteSpace(this.Author.ToString()) ||
-                string.IsNullOrWhiteSpace(this.Publisher.ToString()) ||
+                string.IsNullOrWhiteSpace(this.Author) ||
+                string.IsNullOrWhiteSpace(this.Publisher) ||
                 string.IsNullOrWhiteSpace(this.Pages.ToString()) ||
                 string.IsNullOrWhiteSpace(this.PublicationDate.ToString()) ||
                 this.Price <= 0 ||