UI Changes requested by joe
Merge remote-tracking branch 'origin/master'