Moved some text and links around