Don't add zones multiple times if it can be avoided.
Add missing quotes
Deprecate ampersand
Merge pull request #648 from ExolonDX/master

Tidy up XHTML