refactored form fields for bootstrap