Contextual menu enhancement