Merge some text and layout changes into bug-1111