Mostly reverted Display to 2ef626af74 to remove bug that was introduced at some point (chart on right was squashed)