Some minor changes and moves of pages