Further improved layout and copy changes