More refactoring in cms.display.*