Changed button text and error message presentation.