Fixed some issues in AlertsActivity, more to come