Small fixes with highlight box triangle and text/image content not wrapping around content