Alert boxes improvements