Refactor display, so as to be able to override things.