Refactor analytics to track all navigation