(TO SQUASH) template correctness

attempt to respond to Matthew's queries:

I've got rid of 2 of the forked templates, with partials as appropriate.

update-form.html is still a fork, but at least of the correct file now.