Improved notification and forms