Success and error messages fixed