Profile view, refactoring