refactoring ui adam