fix some navigation problem