Refactoring user pages