Feature/fix amend

In a new template, avoid the `{{!div class="modal-body"}}` clutter.

Also, I try to avoid `{{#instance}}`, especially in new templates, because (IMO) it obscures where data is coming from in the template.