more display refactoring