Extensive layout and text changes