Fixed minor navigate issues