Added some validation to pages