Refactoring some "Scene" to "Display"