Refactor related content for Manage