Refined tracking

Covers more links on page.