Refactored menu system