switch from <dl> to form-group divs