Add table for tournaments and some templates cleanup