Improve form building, add datepickers