Tweak some templates and implement zone edit