More fixes and tweaks
Fixed the alert boxes.