Refactor profile pages cont.