Add Tour update field + base templates
Split controllers