Refactored action menu