Edit groups on edit page and some fixes