fixes to the context menu launcher; refactoring