* set up timepicker to last when dataset is changed

* simplify logic for dataset change

* update modal code

* remove uneeded code

* fix bug

* fix bug