Better sorting, tighter display
Merge branch 'download_stats' into develop