Fix form field labels rendering to use correct id.

This is needed now that the form has a prefix and we can't assume "id_<fieldname>".
Minor template syntax cleanup.