Move more pages to the right places

And fix up other minor stylistic issues