Feature/trip cleanup

Quite a few minor improvements here, the scenario views up to and including route-edit should be pretty set.

See individual commit logs for details.