refactor
UI design