Image group changes for better usability (in progress)