error messages and buttons to improve flow