More layout changes and font changes