fixed layout mostly. moved pages into sections in main