More alert tweaks
UI updates