Better pushpins, zone labels, fixed grouping.