Refactored randomization logic during beta test for consistency throughout user base
Created additional email templates