refactoring remaining page views for consistency