Messing with links locations...again. And minor whitespace changes.