More stats screen stuff, still a work in progress
Merge remote-tracking branch 'origin/master'