Keep the groups in a collection

This matches our usage better.

Additionally, make sure we redraw the active main view when it needs to
be redrawn, which we lost when moving to the mulitplexer.