Fix the link text and such