[FIX] Bring back the date picker