Add tracker to header
Merge branch 'hotfix/tracking'