More refactoring for multiple displays.