Requests for comment/Refactor OutputPage