Fix image layouts