Fix menu builder