Made template-specific sections appear only for multi-instance templates, etc.

Also in this commit:
- "Additional XML" fields are now hidden - no one seemed to be using them,
and they caused a bunch of confusion.
- There was a fix for a bug in field handling

Change-Id: I5450221fbc9bc390a5515fe14f7fa8717504ace6