more ui refactoring
more ui refactoring