tournament navigation refactoring