Some more ui refactoring