+ Merged Trunk @ rev 905
+ fixed a lot of UI nits
Authored by: bworrell 2010-08-27
Parent: [r907]
Child: [r909]