Refactored Manage Pages spec