More work on bug #8161.  I changed how some things are displayed, and put in backgrounds for the text.