More UI fixing up.
Merge remote-tracking branch 'kelley/master'