User page refactoring