Functions merged, date and time picker added