Add datepicker; minor fix