Input groups (form-element-group) done. Minor cleanup.