Move a few links around and remove a typo div

See commit comments.