added date and timepicker
conflict in scheduler fixed