Copy update, minor structure and styles