Refactoring in cms.display