Added alerting functionality and front end fixes