UPDATED: Zone add and edit