Small fixxes
Add support for groups within campaigns