Context Menu Fixes