More refactoring in cms.display.*
Merge branch 'dev' of https://github.com/TheOrangeDuke/ClusterManagementSystem into dev