Did some cleaning, adding group to add/edit user