Refactored context menu