Move more pages into the right places

Reflow and make other minor changes at the same time