Fixed right-click menu