I agree with @neumino. The new structure makes much more sense (since it breaks down content by index type instead of by operation, which I like much better). I don't think the infobox is out of place, I think it's a nice touch here.