Improve style, switch to alert-based status