• Simplified context menus logic