Assorted UI improvements around alerting