Updated Alerts content
Merge branch 'staging'