Improve welcome email
Huge improvements in group selection