Some improvements to tour template