Fixing the menu system, piece by piece