Update for Navigator

![](archive:Feature2_1.gif)