Make the display logic smarter.