Context menu refactoring