user interface updates
Merge remote-tracking branch 'origin'
merged with Kevin's stuff