Minor improvements to display