Updating earlier trace to properly markup labels, editorial observations,
and guiding lines