fix bugs in first two pages