little refactoring + layout changes in statistics
Merge remote-tracking branch 'origin'