Move view tracking logic to ViewTracker