Added back duration and fixed NaN bugs
Update datepicker and timepicker repositories