Tweak templates, remove ids and add zones