Fix page1 issues