some ui behaviour bugfixes