Image layout and markup fixes.