Reorganize notifications/alerts. See #1559