small page refactors