large overhaul to Tour and Agenda layout