Page numbers in the "table" of contents
Unset both anchors simultaneously, wording in contents
Remove hyperlink rectangles
Tweak diagram positions, add boxes