Edit groups and updated form error messages