Full rework of phone and email alerts