More work on bug #8138.  It now puts in the background color, as well and some changes to how it displays things.