fix major navigate bugs