Refactored menuing system