FIXED partial repaint problem on legends.  (Also some minor layout changes).