Some UI fixes. Thinking about complete UI refactoring.