small ui refactoring