some ui bugfixes