refactoring UI elements