1. I find it the currently rendered Template pages with form objects all over the place awful to look at and use. Consider a long page, with 8 fields spread throughout. In order to find the fields you have to scroll up and down etc.
2. I also find it strange that because the page is rendered, it limits what can be set as a field, for example:
   • macro parameters (this kills Template Fields usage for me)
   • url parameters etc
   • links

In order to support what I am about to suggest, the Template fields would have to be updated to support groupings through a Category value, and to provide a clue as to the fields intended purpose, shown here with a # separator char.

Current

||Some field | @fieldname@ |

Proposed

||Some field | @Category1#Field Label text#fieldname@ |

Example form

This would then allow pages with complex arrangement of field values to be easily provided without the Junk that appears with dynamically create content. Also, and most importantly this would allow arbitrary replacement of any text anywhere in the page, solving all related issues about where such values can/cannot be used.