Added client validation and calendar for date