refine new nav tracking

Refine new nav tracking

![](http://media0.giphy.com/media/FOe3ehBn3DGes/giphy.gif)