ui refactoring
misc