Greatly improved view/click tracking