#49: putting date picker back in