AUTHOR-4698 Modal Popup Tweaks