Switch to zone-<n> for zone displays
Remove the unused next match display
Add the zone selection output
Add the layout scaff