Fixed up the friends list too