Bug fix of toplist
Refactored to make room for playoffs