Fixed bug 2941 (or worked around it).  Also cleaned up the display a little.