Refactored form fields for bootstrap

This is probably not exactly how GBH would have it done, but it mostly uses the form_builder to match the Bootstrap elements.