fix: menu builder (requires more fixes)