refactoring
refactoring ui