new page class + pages rework