Various context menu fixes and cleanup