switch to form-group elements
Merge with github