refactoring ui
upgrading