Improve message and enable refresh