Improved display code.