helpflyout menu and Help text
fixed merge conflicts