improved group images and fixes