buttons and error messages updated