Improve Date picker and Time picker