nested pages and sections and other minor changes