GR: updated look for form fields