Improve alert display
Improve alert display