tweak validation, add datepickers