Rework zones to be regular entities first pass.

Clean up some menu handling code.