Updated zotonic_sites dispatch and some template updates