Improved modal screen handling
Add new groups to favourites if < MAX
Disable button when no more users can be selected