Few improvements on showing the messages