small changes to the way modes are drawn.  Checking directly into trunk.