Summary buttons now only show on demand in enroute (fixed #1738)
Some refactoring to reliably unregister picking listeners in enroute