added more form fields
got both datepickerviews working correctly