WP-4563: fix up the modal, spacing.