fix itineraries view and form
more important stuff