Updates to alerts and forms