Fix context menus.
Merge pull request #85 from adobe/glenn/context-menu

Fix context menus