More AlertsActivity changes