Fix the broken menu system