Context menu refactored.