Refactored page hierarchy.