Merge Andrew's layout and copy changes.