move the success message to a better place