UI and texts refactoring