Refactored interactive menu