more refactoring on specific tournament ui