Layout and text improvements.