Refactor Rank, and add details to the profile page