Fit zone map to zone bounds

Fixes #363