ui bugfixes attempt #2