PM: date picker - finish refactor