Make sure popover disappears when modal appears
Append tooltips instead of prepend, tweak tooltips on options page
Add text to SR-only label before maps [#82032036]