Added field validation and default date to date field in case user does not select