cleaned up the stats view a little bit
Merge remote-tracking branch 'upstream/master'

mergin tosh's branch