finally have the date picker fixed