new style for date-picker
merged