UI fixes

The part two of @drgig reported issues