Updated form to handle date field