BZ-9549: Modal and MU confirmation changes from Angel

Signed-off-by: Paden <padenportillo@gmail.com>