More format and layout changes