Some minor tweaks to track viewing