forms: update labels
templates: arrange form fields rendering