fix for alert
UI polishing