UI update 10:11PM
Merge remote-tracking branch 'origin/master'