fixed some issues with context menu