Refactored entry_pages