2240278 modal fixes