Updates to make the itinerary layouts semi-functional