Avatar dialog refactoring