refactored remaining pages