minor form elements bug fixes