Fix bug with adding rankings
Reorganize topic structure a bit