Styling cleanup
Added a groupBy set
Unified naming -- groups are now active, not selected