Updated to use form-group from Bootstrap