quick form and field template fixes