Fixes for ContextMenus and Dialogs

+ one UI fix