Refactored page views