fixed a number of issues related to Navigate