Modal messages improvements