fix stretched images
rearrange gems