UI improvements
refactoring