Ui fixes2 DO NOT MERGE

* modal handling.