Resolved issues about date picker in leaves and user