Fixed up rest of links
Fixed merge conflicts
Default to a kitten image if user doesn't have an avatar :smiley_cat: