Improve error messages and forms