Refactored administration of pages