form field rendering fixes