UI fixes

I've already reported this workflow as non-optimal. I can't find the bug nr though.