more page refactors