Refactored page view control